refactor(grunt): little improvement
refactor(commons): adapt for commons-ui