Some cleanup
PSR