working on clean up