Cleanup, added example class