refactored to take advange of grunt file
more cleanup