Changes to fit code formatting in PSR-2