Typoes
Minor refactor