consistency and formatting
Merge branch 'develop'