reworked grunt file and clean up