PSR-2'ing and adding support for order collection