PSR all the things (again)
Clean up the docs