Minor vim tweaks
Minor edits here and there