Type review (16/45)

Type review