Typos + Type review