+ adding missing comments
+ small cleanups which won't significantly change
  function body.
+ unify Method receiver name