psr2 cleanups