Improved grunt workflow