Add last step tidy functionality