cleaned up scripts a little