Finally decided to go with PSR-2...