minor cleaning of spaces and comments