Clean Up - Cleans up the JS and HTML.
Merge pull request #6 from ehelms/updates

Clean Up - Cleans up the JS and HTML.