Better enforcement of Rank class immutability
A couple more explicit not-null checks
Removed some excess comparisons
Removed unnecessary trim() calls
Merge pull request #5 from dmascenik/reorganized

Addressed code review comments