Refactoring to support Grunt and Solved Resharper Issues