Please update the whole PR to follow the PSR-2 coding standards