work on cleaning up a bit of functionality