Cleanup, refactoring.