cleaning up and constructing full link for observers