formatting changes
Merge branch 'feature/robb/format' into develop