Changes for uglify and formatting