Grunt spec rename
Minor style improvements