PSR compatibility, general clean up