DF Small refactor.