clean up code, dedupe any duplicated functions put into utility function organization
clean up code, dedupe any duplicated functions put into utility function organization