Cleaning up the JS/HTML