Extract the "step"
Cleaned up too much