clean code and use link per jdhenke/uap#5
Merge pull request #31 from jdhenke/always-use-link

clean code and use link per jdhenke/uap#5