Tidy up step definition