Rename method
Comments for functions, small refactoring