PSR standard coding changes