Type review (18/45)

Type review