Rename method
Cleaning up