make method name discoverable
change method name
simplify
Merge remote-tracking branch 'origin/master'