Cleaning up scripts a bit.