clean up JS and use standard English for variable names