Bug 1109630 - Improve and Refactor grunt system

Nit: ) { (space between ) and { )