More steps toward making all code psr-2 compliant