REFACTOR: Cleaned up LinkDao code