Issue #78 Formatting changes