fix redundant setq and add-to-list