Better way to construct link