Rename method name and tweak implementation
3 files changed