[XAPID-1037] refactor | make object based methods
4 files changed