data cleanup
updating state
amending code