Fix formatting.
Add  trait, with test.