remove count remaining from watch
additiona style fixes.