fix step repeat variable names
refactor done