Some presentation tweaks and refactoring.