Whitespace and cleanups