PSR-2 cleanup

Just a series of small PSR-2 compliance clean-ups for an already great library. :beers: