remove * imports and organize