PSR-2 compliance changes :)