Variable clean up and doc string fix.