Refactor sliding and stepping classes