PSR-2
Some improvements