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