Minor - Code conventions - refs BT#6003