Removing unused imports and reshuffling modules