Be more PSR-2 compliant