Cleaning up and moving to requireJS