Reordering imports and removing unneeded comments