cleaned up links and structure