[AESh-245] Extract inner class and start refactore in class
[AESH-245] remove comment
Merge remote-tracking branch 'upstream/master' into AESH-245
Correcting formatting