clean up and PSR