Make output conform to markup slightly better