Refactor 148 fixing bugs from sonarlint #150

Closed marqos12 closed 2 months ago