Code cleanup
Merge branch 'develop'