Refactoring: Clean up.