Revert "Minor code readability improvements and added brackets to "if" statements per PSR-2:5.1: http://www.php-fig.org/psr/psr-2/"

This reverts commit a813a2b17cb33f7e37c8b92fe8240cefbf636f8c.