Fixed formatting.
More formatting.
Merge branch 'develop'