Grunt templater implemented
General cleaning