Remove comments, fix method name