Some refactor and df creation without DVs