Major code cleanup with Grunt integration