Formatting cleanup
Still working on invariant case(s)