Background: cosmetics + refactoring.