More PSR-2 and less static.