Fixer base

Just love to remove duplicated code
I prefer the fixer name `control_spaces`. `controls_spaces` is bad grammar. We should make these kind of brakes now rather than waiting till 2.0 to do them.