Refactoring: code formatting to reduce sonar issues