Cleaned up Doctor, CF, Rule classes
Merge pull request #39 from dteske25/Grant

Cleaned up Doctor, CF, Rule classes