Add comments, trim whitespace