Get rid of these todo, cleaned up a bit.
Merge pull request #37 from moneytree/rpr

Get rid of these todo, cleaned up a bit.