Cleanup/refactor.