grunt watch, better styling, clean up js