mostly markup cleanup++