Reformatting, code review reactions.
Implementing some UX feedback from Marty.