Updated the code to follow the PSR coding standards