Tidy up method naming