Grammar and syntax cleanup
Merge pull request #2169 from johnkary/stopwatchFixes-1

Grammar and syntax cleanup for Stopwatch component