removed psr2 check (too many violations), fixed typo and fixed bug introduced in recent pull request