Cleanup, added interfaces for ease in adding future objects