Minor updates regarding naming convention.
Cleaned up some comments and CSS definitions.