cleaned up PSFGnerator