Tidy.
Refactoring, tidying, and a touch of style.