cleanup and added link