cosmetics: comments and whitespaces