Refactoring and grunt init