Refactor for PSR-2 code style