Clean up spaces/comments