working on a clean up