working on cleaning up example