Some more cleanup

Added a bit of spacing to make the code easier to read, added a few
notes that will be removed afterwards.

Oh, is it safe to remove the BptItem[] comment?