Add comment
Remove underscore from class names