Reorder  imports and removing some unnecessary lang features