tighten up task list and comment style