Cleared up JS and HTML