Rename method
Add some function docs