code clean up
Merge branch 'develop'