REFACTOR: make code compatible with PSR-2 (when viewing diff, please use option "Ignore Whitespace")