After factoring out class: Psr

Clean compile