PSR standard updates.
Fix combatability with Upstream library.