Code cleaning up
Merge branch 'user' of https://github.com/pi-engine/pi into user