cleanup, mostly
capturing single quotes