Added uglify and removed concat