Minimal code refactor.