minor: cleans up imports, generics