cleaning up method names, etc.