minor cleanup

review @aghosn @mdemarne