whitespace

includes various code layout fixes