revise, refactor, tidy up