refactor: tidy up