cleaning up js round 2