slight cleanup of markup