Resolving PSR1/2 Code Violations