Made Trooper mostly PSR 2 compliant.