tidy up method calls