Remove comments
Rename method