Clean up JavaScript + convert to camel case + improve UI