a bit of styling/layout/refactoring