[REFACT] In Imports: changed integer types, cleanup