reduce raw types

Good idea