local code cleanup
Merge branch 'martijn-pc-alg' of ssh://git@github.com/SmileWide/main into martijn-pc-alg