This cleans up the code since bootloader is starting to near 1k lines
The os itself only supports x86 so this won't matter. x86_64 and i386 use the same bootloader assembly.