fix spaces and comments