Cleaned up the main JS and HTML files