Improvements on grunt workflow