working on cleaning up grunt