minor refactor (remove * imports)