Refactorized steps, no need to store them in different arrays when creating them