Working on cleaning up project based on SonarQube recommendations