Refactoring and fix typo

Yep, that's good change. No need to return from `__construct.`