Some of the sonar issues reported are quite complex logic, i would like to keep the code in each commit as independent as possible so the review could be easy .

I will keep this as placeholder for handling refactoring