Rename steps & add comments