working on cleaning up