SonarQube Fixes for CleaningState.java
- Fixes for some of the violations listed by SonarQube for
CleaningState.java