Tidy up method calls