Fixed issues to comply with PHP Mess Detector