formatting cleanup to make compare easier
formatting cleanup for easier compare, swap in proper impl code where
possible.