Renaming the DAO objects so my brain can remember what it is looking at.
More minor cleanup to make my brain lazier. I use calculators.