Tidy up some things after a code review