Refactoring in link interpreter