Formatting changes requested by @waywardmonkeys