Comment, naming convention, whitespate updates