Formatting cleanup, more hellfish