work on cleaning up scripts