Fixed PSR-2 coding standards
Removed unnecessary conditions