Refactor + Grunt + minified JS