misc neatening. Mainly whitespace