fixed indents and cleanup
removed whitespace