reduce raw types

Oops thanks!