[No review required] Markups from initial code review