Finished changes with jen/running though jslint