getting ready to clean up the code