Little cleanup and adjusted target="_blank"