Adaptions for better readability

Correct order in computation of Mx+D in PSF now.