Code cleanup
Merge branch 'cleanup' into develop