Tidy up (some of) the code