stop_watch: code cleanup