Minor - Code conventions - refs BT#9041