Refactoring. Cleanup.