Tidying up method signatures