[Implement] SQ improvements

[samatstariongroup]

Prerequisites

• [x] I have written a descriptive pull-request title
• [x] I have verified that there are no overlapping pull-requests open
• [x] I have verified that I am following the COMET-WEB code style guidelines
• [x] I have provided test coverage for my change (where applicable)

Description

refactor code as per SQ suggestions

[sonarcloud[bot]]

Quality Gate failed

Failed conditions
57.1% Coverage on New Code (required ≥ 70%)

See analysis details on SonarCloud