fix DanH’s comments