Formatting changes as per comments on #50