clean up syntax
Merge branch 'master' of https://github.com/MBHS-SPC/speed-trig
merge master