cleaning up tags
removing extra class tags
Qians notes
changes for review
Merge pull request #6 from GoogleChrome/dev

Changes suggested from initial review.