[AESH-245] Extract inner class and start refactore in class