Refactor for clarity
Merge branch 'master' of https://github.com/runkmc/motion-colortools