A quick refactor.