Tidy up workflow