Adding watch task, refactor less to be more grunty