start refactoring code
update grunt file