Cleanup/refactoring.