More PSR coding compliance