Change method names, delete comments