Tidy up after refactor