code clean up
Merge branch 'develop' - code clean up