Whitespace cleanup
Big code cleanup