Added uglify and fixed formatting