- unsafe link contructor
refactor/cleanup