Minor edits, cleaner completion file