edit comments and method names