Minor refactoring
Reduce the scope of the default grunt task