class methods moved to already defined class<<self block
Merge pull request #12890 from akshay-vishnoi/refactor

class methods moved to already defined class<<self block