mainly whitespace changes and cleanup