More work on PSR-2ing the library