CONN-167: Fixed low priority findBugs issues and code cleanup