Implemented TODOs I had previously created.  Removed a redundant sentence.