removed whitespace and fixed indents