WIP: Refactor typo