Revert some of the refactor
Typos...