More sonar fixes, reduction of method lengths/complexity.