Minor code changes to make PSR2-compliant