making this all nice and PSR-0y