[fix] fixed generics
[cleanup] organized imports