Small step controller refactoring