Renamed all comments helpers
Whitespace
Class names for page types