clean up indentation and whitespace