code cleanup
grunt for tests