Changing implementation to be more forgiving about variable type
Sonar related updates.