Cleaning up js