tightening to PSR-0 formatting