Clean up code
Add grunt uglify build