clean up the OO in the example