make code psr2 compliant