More accurate names
Less code
Fixing indentation
More accurate names
Merge pull request #302 from caelum/ot-linktominors

Some linkto minor fixes