Formatting changes

No functionality changes were made here. Just those to make the formatting a little more consistent (especially comments).