Code clean-up
Merge branch 'master' of https://github.com/arbourd/cst8257