PSR- and other clean ups.