Drill-346 : code clean up.