Refactored some code styles
Merge branch 'develop'