Made changes suggested by Sonar...