Refactoring and fix typo

Because it seems to me so beautiful.