PSR-2 refactor, first pass