minor cleanup of variables