Formatting changes to cut it down to 27 lines