I hope I fixed a few SonarQube issues