Re-align with PSR coding standards