Controller refactoring, step to field cloning