Cleaning up, adding link