Remove unnecessary save-excursion and goto-char