Move out upstream code to separate methods (for tab fixing)

- also tab fixing enabled for "ClassDeclaration" sniff