Replacing :delegate meta-programming with method

This simplifies the call stack.
Renaming input parameter

It was wrong and confusing
Adding additional specs for translation of links
Merge branch 'minor-refactoring-and-corrections'

* minor-refactoring-and-corrections:
  Adding additional specs for translation of links
  Renaming input parameter
  Replacing :delegate meta-programming with method