Obvious typo is obvious (+ refactor a bit)