Cleaning up data and JS