styling changes, code refactoring
Merge branch 'develop'