registration step refactoring