formatting and cleanup
Merge branch 'dev' of https://github.com/everharder/ColorTracking into dev