Working toward PSR-2 standards