cleanup classes for PSR-2 compatibility part 2