Tidy up / refactor