completed the assignment, cleaned up.
Merge pull request #2 from branwall/class-rewrite

completed the assignment, cleaned up.