Cleanup.
Style refactoring.