PSR1/2 updates/phpdoc updates