refactoring and cleaning code (StepController is now declared as service)