PSR-2 changes and reduced cyclomatic complexity a bit