reduce raw types

well spotted, fixed