PSR- and other clean ups.
Merge pull request #152 from xi-project/cleanup-crew

PSR- and other clean ups.