Fixing the listed issues from PHP Mess Detector