Cleanup of refactoring effort.