imports and organization section cleanup