PSR-2 cleanup and PEAR dependencies removed