Simplify step data handling.