Tidy up feature and steps