cleanup using inheritance
Merge pull request #2 from conduit/cleanup

cleanup using inheritance