PSR-2 compliant and minor changes