Minor code reformatting.
Merge branch 'dev' into test