CONN-560 cleaned up code
Merge pull request #590 from SrinivasaMurthy/CONN-560

CONN-560 cleaned up code