Code cleaning up
Merge branch 'develop' into user