Df clean code

Keep this, since this simplification can be done now.