Formatting changes

Clean-up and formatting changes