Minor refactoring on steps