clean up white space, indentation, comments