^ update some more classes to follow up PSR-2

and also delete unneeded classes