formatting changes to adhere to conventions
more formating changes for consistency