CONN-152: Fixed findBugs issues with rank(1-14)
CONN-152: Code cleanup and formatting
Merge pull request #397 from nareshcgi/CONN-152

CONN-152: Fixed findBugs issues with rank(1-14)