Cleaned up some of the link hint functions