issue 1 clean up