Cleaning up JS and index