new links structure and removed extra spaces