Refactored grunt tasks