Annnd a bunch of whitespace fixes.