refactor and added grunt to uglify and concat