Feature: refactored grunt tasks