chore(style): decrease complexity code 20, and delete class increase
chore(style): decrease complexity code 20, and delete class increase

bdronneau/imwatchingyou,bdronneau/imwatchingyou,bdronneau/imwatchingyou,basti1dr/imwatchingyou,bdronneau/imwatchingyou,basti1dr/imwatchingyou,basti1dr/imwatchingyou,basti1dr/imwatchingyou