diff --git a/share/completions/a2disconf.fish b/share/completions/a2disconf.fish
index 1cf1ae47d..a1d0a4a56 100644
--- a/share/completions/a2disconf.fish
+++ b/share/completions/a2disconf.fish
@@ -2,4 +2,3 @@ complete -c a2disconf -s q -l quiet -d "Don't show informative messages"
 complete -c a2disconf -s p -l purge -d "Purge all traces of module"
 
 complete -c a2disconf -xa '(__fish_print_debian_apache_confs)'
-
diff --git a/share/completions/a2dismod.fish b/share/completions/a2dismod.fish
index baad99339..e8bf56272 100644
--- a/share/completions/a2dismod.fish
+++ b/share/completions/a2dismod.fish
@@ -2,4 +2,3 @@ complete -c a2dismod -s q -l quiet -d "Don't show informative messages"
 complete -c a2dismod -s p -l purge -d "Purge all traces of module"
 
 complete -c a2dismod -xa '(__fish_print_debian_apache_mods)'
-
diff --git a/share/completions/a2dissite.fish b/share/completions/a2dissite.fish
index 49f4f6756..6e06fc8e5 100644
--- a/share/completions/a2dissite.fish
+++ b/share/completions/a2dissite.fish
@@ -2,4 +2,3 @@ complete -c a2dissite -s q -l quiet -d "Don't show informative messages"
 complete -c a2dissite -s p -l purge -d "Purge all traces of module"
 
 complete -c a2dissite -xa '(__fish_print_debian_apache_sites)'
-
diff --git a/share/completions/a2enconf.fish b/share/completions/a2enconf.fish
index 66cd02bca..852e541a1 100644
--- a/share/completions/a2enconf.fish
+++ b/share/completions/a2enconf.fish
@@ -1,4 +1,3 @@
 complete -c a2enconf -s q -l quiet -d "Don't show informative messages"
 
 complete -c a2enconf -xa '(__fish_print_debian_apache_confs)'
-
diff --git a/share/completions/a2enmod.fish b/share/completions/a2enmod.fish
index 90594ead1..f7589f007 100644
--- a/share/completions/a2enmod.fish
+++ b/share/completions/a2enmod.fish
@@ -1,4 +1,3 @@
 complete -c a2enmod -s q -l quiet -d "Don't show informative messages"
 
 complete -c a2enmod -xa '(__fish_print_debian_apache_mods)'
-
diff --git a/share/completions/a2ensite.fish b/share/completions/a2ensite.fish
index 4b7cbebd4..c3ace4db6 100644
--- a/share/completions/a2ensite.fish
+++ b/share/completions/a2ensite.fish
@@ -1,4 +1,3 @@
 complete -c a2ensite -s q -l quiet -d "Don't show informative messages"
 
 complete -c a2ensite -xa '(__fish_print_debian_apache_sites)'
-
diff --git a/share/completions/accept.fish b/share/completions/accept.fish
index 3765d5725..d5107dd96 100644
--- a/share/completions/accept.fish
+++ b/share/completions/accept.fish
@@ -1,3 +1,2 @@
 __fish_complete_lpr accept
 complete -c accept -s r -d 'Accept reason' -x
-
diff --git a/share/completions/alsactl.fish b/share/completions/alsactl.fish
index ff4debe76..8ae9050b3 100644
--- a/share/completions/alsactl.fish
+++ b/share/completions/alsactl.fish
@@ -30,4 +30,3 @@ complete -c alsactl -s b -l background -d 'Run the task in background'
 complete -c alsactl -s s -l syslog -d 'Use syslog for messages'
 complete -c alsactl -s n -l nice -d 'Set the process priority (see \'man nice\')' -a "(seq -20 19)"
 complete -c alsactl -s c -l sched-idle -d 'Set the process scheduling policy to idle (SCHED_IDLE)'
-
diff --git a/share/completions/apt-cache.fish b/share/completions/apt-cache.fish
index c9cd162b3..67c2f6479 100644
--- a/share/completions/apt-cache.fish
+++ b/share/completions/apt-cache.fish
@@ -39,4 +39,3 @@ function __fish_apt-cache_use_package -d 'Test if apt command should have packag
 end
 
 complete -c apt-cache -n __fish_apt-cache_use_package -a '(__fish_print_packages)' -d Package
-
diff --git a/share/completions/apt-extracttemplates.fish b/share/completions/apt-extracttemplates.fish
index 1d1d049ee..910f36cfe 100644
--- a/share/completions/apt-extracttemplates.fish
+++ b/share/completions/apt-extracttemplates.fish
@@ -4,4 +4,3 @@ complete -c apt-extracttemplates -s h -l help -d "Display help and exit"
 complete -r -c apt-extracttemplates -s t -d "Set temp dir"
 complete -r -c apt-extracttemplates -s c -d "Specify config file"
 complete -r -c apt-extracttemplates -s o -d "Specify options"
-
diff --git a/share/completions/apt-get.fish b/share/completions/apt-get.fish
index 04e057894..abf4ddc73 100644
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -65,4 +65,3 @@ complete -c apt-get -l allow-unauthenticated -d 'Ignore non-authenticated packag
 complete -c apt-get -s v -l version -d 'Display version and exit'
 complete -r -c apt-get -s c -l config-file -d 'Specify a config file'
 complete -r -c apt-get -s o -l option -d 'Set a config option'
-
diff --git a/share/completions/apt-key.fish b/share/completions/apt-key.fish
index 53bb3cc4e..72073e574 100644
--- a/share/completions/apt-key.fish
+++ b/share/completions/apt-key.fish
@@ -2,4 +2,3 @@
 complete -r -c apt-key -a add -d "Add a new key"
 complete -f -c apt-key -a del -d "Remove a key"
 complete -f -c apt-key -a list -d "List trusted keys"
-
diff --git a/share/completions/apt-listbugs.fish b/share/completions/apt-listbugs.fish
index 737fc7e82..0522a8693 100644
--- a/share/completions/apt-listbugs.fish
+++ b/share/completions/apt-listbugs.fish
@@ -22,4 +22,3 @@ complete -f -c apt-listbugs -s y -l force-yes -d "Assume yes to all questions"
 complete -f -c apt-listbugs -s n -l force-no -d "Assume no to all questions"
 complete -c apt-listbugs -a list -d "List bugs from packages"
 complete -c apt-listbugs -a rss -d "List bugs in rss format"
-
diff --git a/share/completions/apt-proxy-import.fish b/share/completions/apt-proxy-import.fish
index 9f26f3771..e943119ab 100644
--- a/share/completions/apt-proxy-import.fish
+++ b/share/completions/apt-proxy-import.fish
@@ -7,4 +7,3 @@ complete -f -c apt-proxy-import -s r -l recursive -d 'Recurse into subdir'
 complete -r -c apt-proxy-import -s i -l import-dir -a '(for i in */; echo $i; end)' -d 'Dir to import'
 complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d 'Change to user'
 complete -r -c apt-proxy-import -s d -l debug -d 'Debug level[default 0]'
-
diff --git a/share/completions/apt-rdepends.fish b/share/completions/apt-rdepends.fish
index 5beba9b69..408814f41 100644
--- a/share/completions/apt-rdepends.fish
+++ b/share/completions/apt-rdepends.fish
@@ -10,4 +10,3 @@ complete -r -f -c apt-rdepends -l state-follow -d "Comma-separated list of packa
 complete -r -f -c apt-rdepends -l state-show -d "Comma-separated list of package installation states to show"
 complete -f -c apt-rdepends -l man -d "Display man page"
 complete -f -c apt-rdepends -l version -d "Display version and exit"
-
diff --git a/share/completions/apt-setup.fish b/share/completions/apt-setup.fish
index 0cf066c4a..d15c5975e 100644
--- a/share/completions/apt-setup.fish
+++ b/share/completions/apt-setup.fish
@@ -1,4 +1,3 @@
 #apt-setup
 complete -c apt-setup -a probe -d "Probe a CD"
 complete -c apt-setup -s N -d "Run in non-interactive mode"
-
diff --git a/share/completions/apt-show-versions.fish b/share/completions/apt-show-versions.fish
index 61bb661f0..ccaf6eb5e 100644
--- a/share/completions/apt-show-versions.fish
+++ b/share/completions/apt-show-versions.fish
@@ -11,4 +11,3 @@ complete -r -c apt-show-versions -l status-file -d 'Read package from file'
 complete -r -c apt-show-versions -o stf -d 'Read package from file'
 complete -r -c apt-show-versions -l list-dir -a '(for i in */; echo $i; end) /var/lib/apt/lists /var/state/apt/lists' -d 'Specify APT list dir'
 complete -r -c apt-show-versions -o ld -a '(for i in */; echo $i; end) /var/lib/apt/lists /var/state/apt/lists' -d 'Specify APT list dir'
-
diff --git a/share/completions/apt-sortpkgs.fish b/share/completions/apt-sortpkgs.fish
index 2ebce7637..4014f735d 100644
--- a/share/completions/apt-sortpkgs.fish
+++ b/share/completions/apt-sortpkgs.fish
@@ -4,4 +4,3 @@ complete -f -c apt-sortpkgs -s s -l source -d "Use source index field"
 complete -f -c apt-sortpkgs -s v -l version -d "Display version and exit"
 complete -r -c apt-sortpkgs -s c -l conf-file -d "Specify conffile"
 complete -r -f -c apt-sortpkgs -s o -l option -d "Set config options"
-
diff --git a/share/completions/apt-spy.fish b/share/completions/apt-spy.fish
index e7c292e3b..01abc22bf 100644
--- a/share/completions/apt-spy.fish
+++ b/share/completions/apt-spy.fish
@@ -16,5 +16,3 @@ complete -c apt-spy -s w -d "Write top servers to file"
 complete -f -c apt-spy -s n -d "Number of top servers"
 complete -f -c apt-spy -a update -d "Update mirror list"
 complete -f -c apt-spy -s v -d "Version number"
-
-
diff --git a/share/completions/apt-zip-inst.fish b/share/completions/apt-zip-inst.fish
index 13c3977dd..757d0adfc 100644
--- a/share/completions/apt-zip-inst.fish
+++ b/share/completions/apt-zip-inst.fish
@@ -6,5 +6,3 @@ complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dis
 complete -c apt-zip-inst -s p -l packages -d "List of packages to install"
 complete -f -c apt-zip-inst -s f -l fix-broken -d "Fix broken option"
 complete -c apt-zip-inst -l skip-mount -d "Specify a non-mountpoint dir"
-
-
diff --git a/share/completions/apt-zip-list.fish b/share/completions/apt-zip-list.fish
index c6686f2e4..e98ad5516 100644
--- a/share/completions/apt-zip-list.fish
+++ b/share/completions/apt-zip-list.fish
@@ -10,4 +10,3 @@ complete -c apt-zip-list -s M -l method -d "Select a method"
 complete -c apt-zip-list -s o -l options -a "tar restart" -d "Specify options"
 complete -c apt-zip-list -s A -l accept -a "http ftp" -d "Accept protocols"
 complete -c apt-zip-list -s R -l reject -a "http ftp" -d "Reject protocols"
-
diff --git a/share/completions/aptitude.fish b/share/completions/aptitude.fish
index a40ce153d..d14f118e7 100644
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -65,4 +65,3 @@ complete -r -c aptitude -s t -l target-release -d 'Set the release from which pa
 complete -r -c aptitude -s O -l sort -d 'Specify the order for the output from the search command'
 complete -r -c aptitude -s o -d 'Set a configuration file option directly'
 complete -r -c aptitude -s w -l width -d 'Specify the display width for the output from the search command'
-
diff --git a/share/completions/arc.fish b/share/completions/arc.fish
index 97ebe3f63..a100614eb 100644
--- a/share/completions/arc.fish
+++ b/share/completions/arc.fish
@@ -303,4 +303,3 @@ complete -f -c arc -n '__fish_arc_using_command liberate' -l library-name -d 'Se
 
 ### version
 complete -f -c arc -n __fish_arc_needs_command -a version -d 'Shows the current version of arcanist'
-
diff --git a/share/completions/arp.fish b/share/completions/arp.fish
index 4b38f9b9f..3f79f7ae9 100644
--- a/share/completions/arp.fish
+++ b/share/completions/arp.fish
@@ -8,4 +8,3 @@ complete -c arp -s D -l use-device -d "Use hardware address"
 complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d "Select interface"
 complete -x -c arp -s s -l set -d "Manually create ARP address" -a "(__fish_print_hostnames)"
 complete -f -c arp -s f -l file -d "Take addr from filename, default /etc/ethers"
-
diff --git a/share/completions/asp.fish b/share/completions/asp.fish
index 8fdd0e735..c3081b869 100644
--- a/share/completions/asp.fish
+++ b/share/completions/asp.fish
@@ -23,4 +23,3 @@ complete -c asp -n "not __fish_seen_subcommand_from $commands" -a untrack -d "Re
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update" -a "(asp list-all | string replace -r '.*/' '')" -f
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update untrack" -a "(asp list-local | string replace -r '.*/' '')" -f \
     -d "Locally tracked package"
-
diff --git a/share/completions/at.fish b/share/completions/at.fish
index 52f783900..d6a0f6120 100644
--- a/share/completions/at.fish
+++ b/share/completions/at.fish
@@ -7,4 +7,3 @@ complete -f -c at -s l -d "Alias for atq"
 complete -f -c at -s d -d "Alias for atrm"
 complete -f -c at -s v -d "Show the time"
 complete -f -c at -s c -d "Print the jobs listed"
-
diff --git a/share/completions/atd.fish b/share/completions/atd.fish
index 835320f94..1ee38bb48 100644
--- a/share/completions/atd.fish
+++ b/share/completions/atd.fish
@@ -3,4 +3,3 @@ complete -f -c atd -s l -d "Limiting load factor"
 complete -f -c atd -s b -d "Minimum interval in seconds"
 complete -f -c atd -s d -d "Debug mode"
 complete -f -c atd -s s -d "Process at queue only once"
-
diff --git a/share/completions/atq.fish b/share/completions/atq.fish
index 0b19a1f2a..c5aed4659 100644
--- a/share/completions/atq.fish
+++ b/share/completions/atq.fish
@@ -1,4 +1,3 @@
 #atq
 complete -f -c atq -s V -d "Display version and exit"
 complete -f -c atq -s q -d "Use specified queue"
-
diff --git a/share/completions/bind.fish b/share/completions/bind.fish
index dd37570c5..3989bc1c4 100644
--- a/share/completions/bind.fish
+++ b/share/completions/bind.fish
@@ -56,5 +56,3 @@ complete -c bind -s L -l list-modes -d 'Display a list of defined bind modes'
 
 complete -c bind -n __fish_bind_test1 -a '(bind --key-names)' -d 'Key name' -x
 complete -c bind -n __fish_bind_test2 -a '(bind --function-names)' -d 'Function name' -x
-
-
diff --git a/share/completions/cancel.fish b/share/completions/cancel.fish
index d890b3891..e3ebe9b95 100644
--- a/share/completions/cancel.fish
+++ b/share/completions/cancel.fish
@@ -1,3 +1,2 @@
 __fish_complete_lpr cancel
 complete -c cancel -s u -d 'Cancel jobs owned by username' -xa '(__fish_complete_users)'
-
diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index 9d7b3a8a2..8cf92b3f8 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -86,4 +86,3 @@ complete -c cargo -x -n '__fish_seen_subcommand_from update' -l precise -d 'Upda
 
 complete -c cargo -x -n '__fish_seen_subcommand_from yank' -l vers -d 'The version to yank or un-yank'
 complete -c cargo -n '__fish_seen_subcommand_from yank' -l undo -d 'Undo a yank, putting a version back into the index'
-
diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index b7cc526c5..84698290b 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -18,4 +18,4 @@ else # OS X
     complete -c cat -s t -d "Show unprintables; tab as '^I'"
     complete -c cat -s u -d "Disable output buffering"
     complete -c cat -s v -d "Escape non-printing chars"
-end
\ No newline at end of file
+end
diff --git a/share/completions/cdrecord.fish b/share/completions/cdrecord.fish
index 306208893..01cd0eb85 100644
--- a/share/completions/cdrecord.fish
+++ b/share/completions/cdrecord.fish
@@ -88,5 +88,3 @@ complete -c cdrecord -o copy -d "All TOC entries for subsequent audio tracks of
 complete -c cdrecord -o nocopy -d "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has permission to be copied only once for personal use"
 complete -c cdrecord -o scms -d "All TOC entries for subsequent audio tracks of the resulting CD will indicate that the audio data has no permission to be copied"
 complete -c cdrecord -a "tsize=" -d "If the master image for the next track has been stored on a raw disk, use this option to specify the valid amount of data on this disk"
-
-
diff --git a/share/completions/climate.fish b/share/completions/climate.fish
index bfac76ecb..a4bb4edda 100644
--- a/share/completions/climate.fish
+++ b/share/completions/climate.fish
@@ -73,4 +73,3 @@ complete -f -n __fish_climate_has_no_argument -c climate -a disk -d 'Find disk u
 complete -f -n __fish_climate_has_no_argument -c climate -a get-pids -d 'Get all PIDs for a process name'
 complete -f -n __fish_climate_has_no_argument -c climate -a trash-size -d 'Find the trash size'
 complete -f -n __fish_climate_has_no_argument -c climate -a empty -d 'Empty the trash'
-
diff --git a/share/completions/colorsvn.fish b/share/completions/colorsvn.fish
index 0589e796b..8d41431fc 100644
--- a/share/completions/colorsvn.fish
+++ b/share/completions/colorsvn.fish
@@ -1,2 +1 @@
 complete -c colorsvn -w svn
-
diff --git a/share/completions/continue.fish b/share/completions/continue.fish
index 3f9226efc..7c3dc7add 100644
--- a/share/completions/continue.fish
+++ b/share/completions/continue.fish
@@ -1,3 +1,2 @@
 
 complete -c continue -s h -l help -d 'Display help and exit'
-
diff --git a/share/completions/cowsay.fish b/share/completions/cowsay.fish
index 89b41dbd2..03426ab89 100644
--- a/share/completions/cowsay.fish
+++ b/share/completions/cowsay.fish
@@ -15,5 +15,3 @@ complete -c cowsay -s s -d "Stoned cow"
 complete -c cowsay -s t -d "Tired cow"
 complete -c cowsay -s w -d "Wired cow"
 complete -c cowsay -s y -d "Young cow"
-
-
diff --git a/share/completions/cowthink.fish b/share/completions/cowthink.fish
index e99be1829..6327c17a9 100644
--- a/share/completions/cowthink.fish
+++ b/share/completions/cowthink.fish
@@ -15,5 +15,3 @@ complete -c cowthink -s s -d "Stoned cow"
 complete -c cowthink -s t -d "Tired cow"
 complete -c cowthink -s w -d "Wired cow"
 complete -c cowthink -s y -d "Young cow"
-
-
diff --git a/share/completions/cupsaccept.fish b/share/completions/cupsaccept.fish
index c66f6a775..d218562e5 100644
--- a/share/completions/cupsaccept.fish
+++ b/share/completions/cupsaccept.fish
@@ -1,3 +1,2 @@
 __fish_complete_lpr cupsaccept
 complete -c cupsaccept -s r -d 'Accept reason' -x
-
diff --git a/share/completions/cupsdisable.fish b/share/completions/cupsdisable.fish
index 2c044aed2..abd6b87fe 100644
--- a/share/completions/cupsdisable.fish
+++ b/share/completions/cupsdisable.fish
@@ -4,4 +4,3 @@ complete -c cupsdisable -s c -d 'Cancels all jobs on the named destination'
 complete -c cupsdisable -l hold -d 'Holds remaining jobs on the named printer'
 complete -c cupsdisable -l release -d 'Releases pending jobs for printing'
 complete -c cupsdisable -s r -d 'Disable reason' -x
-
diff --git a/share/completions/cupsenable.fish b/share/completions/cupsenable.fish
index 81051fc11..9dbc21a1a 100644
--- a/share/completions/cupsenable.fish
+++ b/share/completions/cupsenable.fish
@@ -4,4 +4,3 @@ complete -c cupsenable -s c -d 'Cancels all jobs on the named destination'
 complete -c cupsenable -l hold -d 'Holds remaining jobs on the named printer'
 complete -c cupsenable -l release -d 'Releases pending jobs for printing'
 complete -c cupsenable -s r -d 'Cancel reason' -x
-
diff --git a/share/completions/cupsreject.fish b/share/completions/cupsreject.fish
index 5f2d98df5..99f947edd 100644
--- a/share/completions/cupsreject.fish
+++ b/share/completions/cupsreject.fish
@@ -1,3 +1,2 @@
 __fish_complete_lpr cupsreject
 complete -c cupsreject -s r -d 'Reject reason' -x
-
diff --git a/share/completions/cut.fish b/share/completions/cut.fish
index b1bf349ce..0d92280a2 100644
--- a/share/completions/cut.fish
+++ b/share/completions/cut.fish
@@ -9,4 +9,3 @@ complete -c cut -l output-delimiter -x -d "Select output delimiter"
 complete -c cut -s z -l zero-terminated -d "line delimiter is NUL, not newline"
 complete -c cut -l help -d "Display help and exit"
 complete -c cut -l version -d "Display version and exit"
-
diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index dc9873f3b..71cc55554 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -507,6 +507,3 @@ complete -c cvs -n 'contains \'watch\' (commandline -poc)' -s a -x -a 'add remov
 
 complete -c cvs -n 'contains \'watchers\' (commandline -poc)' -s l -d 'Process this directory only (not recursive).'
 complete -c cvs -n 'contains \'watchers\' (commandline -poc)' -s R -d 'Process directories recursively (default).'
-
-
-
diff --git a/share/completions/date.fish b/share/completions/date.fish
index 63a89945f..6bd01f6f8 100644
--- a/share/completions/date.fish
+++ b/share/completions/date.fish
@@ -38,4 +38,3 @@ else
     complete -c date -s t -d "Set system's minutes west of GMT" -x
     complete -c date -s f -d 'Use format string to parse date' -f
 end
-
diff --git a/share/completions/djview.fish b/share/completions/djview.fish
index 3822026b1..e88db8eae 100644
--- a/share/completions/djview.fish
+++ b/share/completions/djview.fish
@@ -1,3 +1,2 @@
 
 complete -c djview -x -a "(__fish_complete_suffix .djvu)"
-
diff --git a/share/completions/djview4.fish b/share/completions/djview4.fish
index ca81c3f42..91d3054be 100644
--- a/share/completions/djview4.fish
+++ b/share/completions/djview4.fish
@@ -1,3 +1,2 @@
 
 complete -c djview4 -x -a "(__fish_complete_suffix .djvu)"
-
diff --git a/share/completions/dlocate.fish b/share/completions/dlocate.fish
index 035f67939..af5daceeb 100644
--- a/share/completions/dlocate.fish
+++ b/share/completions/dlocate.fish
@@ -3,4 +3,3 @@ complete -c dlocate -s S -x -d 'List records that match filenames'
 complete -c dlocate -s L -d 'List all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o ls -d 'ls -ldF all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o du -d 'du -sck all files in the package' -xa '(__fish_print_packages)'
-
diff --git a/share/completions/du.fish b/share/completions/du.fish
index 0048f031b..a7c996d27 100644
--- a/share/completions/du.fish
+++ b/share/completions/du.fish
@@ -17,4 +17,3 @@ complete -c du -l exclude -r -d "Exclude files that match pattern"
 complete -c du -l max-depth -r -d "Recursion limit"
 complete -c du -l help -d "Display help and exit"
 complete -c du -l version -d "Display version and exit"
-
diff --git a/share/completions/duply.fish b/share/completions/duply.fish
index 12259be1b..57ad34bc4 100644
--- a/share/completions/duply.fish
+++ b/share/completions/duply.fish
@@ -26,4 +26,3 @@ complete --command duply --no-files --long-option preview -d 'Do nothing but pri
 complete --command duply --no-files --long-option dry-run -d 'Calculate what would be done, but don''t perform any actions'
 complete --command duply --no-files --long-option allow-source-mismatch -d 'Don''t abort when backup different dirs to the same backend'
 complete --command duply --no-files --long-option verbosity --arguments '0 2 4 8 9' -d 'Output verbosity level'
-
diff --git a/share/completions/elatex.fish b/share/completions/elatex.fish
index 57f46615b..85c77121f 100644
--- a/share/completions/elatex.fish
+++ b/share/completions/elatex.fish
@@ -1,2 +1 @@
 complete -c elatex -w tex
-
diff --git a/share/completions/eopkg.fish b/share/completions/eopkg.fish
index 00a02269a..c8d78f959 100644
--- a/share/completions/eopkg.fish
+++ b/share/completions/eopkg.fish
@@ -151,4 +151,3 @@ complete -c eopkg -s p -l password -x
 complete -c eopkg -s u -l username -x
 complete -c eopkg -s v -l verbose -d "Detailed output"
 complete -c eopkg -s y -l yes-all -d "Assume yes for all yes/no queries"
-
diff --git a/share/completions/flac.fish b/share/completions/flac.fish
index a7693b8f3..c4527bfc1 100644
--- a/share/completions/flac.fish
+++ b/share/completions/flac.fish
@@ -79,5 +79,3 @@ complete -c flac -l no-seektable
 complete -c flac -l no-silent -d "Write runtime encode/decode statistics"
 complete -c flac -l no-force -d "Don't force overwriting of output files"
 complete -c flac -l no-verify -d "Don't verify a correct encoding"
-
-
diff --git a/share/completions/fuser.fish b/share/completions/fuser.fish
index 9d1a17023..3df7f00e0 100644
--- a/share/completions/fuser.fish
+++ b/share/completions/fuser.fish
@@ -19,4 +19,3 @@ complete -c fuser -s v -l verbose -d 'Verbose mode'
 complete -c fuser -s V -d 'Print version and exit'
 complete -c fuser -s 4 -l ipv4 -d 'Search only for IPv4 sockets'
 complete -c fuser -s 6 -l ip64 -d 'Search only for IPv6 sockets'
-
diff --git a/share/completions/fusermount.fish b/share/completions/fusermount.fish
index 0c62c64dd..a4b5cf7cf 100644
--- a/share/completions/fusermount.fish
+++ b/share/completions/fusermount.fish
@@ -10,4 +10,3 @@ complete -c fusermount -s o -x -d "Mount options"
 complete -c fusermount -s u -d Unmount
 complete -c fusermount -s q -d Quiet
 complete -c fusermount -s z -d "Lazy unmount"
-
diff --git a/share/completions/gem.fish b/share/completions/gem.fish
index 05c94abc9..691e5642e 100644
--- a/share/completions/gem.fish
+++ b/share/completions/gem.fish
@@ -190,4 +190,3 @@ complete $update_opt -s P -l trust-policy -d "Specify gem trust policy" -x
 complete $update_opt -l ignore-dependencies -d "Do not install any required dependent gems"
 complete $update_opt -s y -l include-dependencies -d "Unconditionally install the required dependent gems"
 complete $update_opt -l system -d "Update the RubyGems system software"
-
diff --git a/share/completions/gpasswd.fish b/share/completions/gpasswd.fish
index f51489d4d..8a9dfefd8 100644
--- a/share/completions/gpasswd.fish
+++ b/share/completions/gpasswd.fish
@@ -7,4 +7,3 @@ complete -c gpasswd -s r -l remove-password -d 'Remove the GROUP\'s password'
 complete -c gpasswd -s R -l restrict -d 'Restrict access to GROUP to its members'
 complete -c gpasswd -s M -l members -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
 complete -c gpasswd -s A -l administrators -d 'set the list of administrators for GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
-
diff --git a/share/completions/grub-mkrescue.fish b/share/completions/grub-mkrescue.fish
index 3fb7f334a..513c2b114 100644
--- a/share/completions/grub-mkrescue.fish
+++ b/share/completions/grub-mkrescue.fish
@@ -25,4 +25,3 @@ complete -c grub-mkrescue -l xorriso -r -d "Use given file as xorriso"
 complete -c grub-mkrescue -l help -s '?' -d "Show help"
 complete -c grub-mkrescue -l usage -d "Show short usage message"
 complete -c grub-mkrescue -l version -s V -d "Show program version"
-
diff --git a/share/completions/grunt.fish b/share/completions/grunt.fish
index 1e8b2882c..eb8df80d4 100644
--- a/share/completions/grunt.fish
+++ b/share/completions/grunt.fish
@@ -28,4 +28,3 @@ complete -c grunt -l no-write -d "Disable writing files (dry run)"
 complete -c grunt -s v -l verbose -d "Verbose mode. A lot more information output"
 complete -c grunt -s V -l version -d "Print the grunt version. Combine with --verbose for more info"
 complete -c grunt -l completion -d "Output shell auto-completion rules."
-
diff --git a/share/completions/gunzip.fish b/share/completions/gunzip.fish
index 259ed5fa2..7ec611032 100644
--- a/share/completions/gunzip.fish
+++ b/share/completions/gunzip.fish
@@ -16,4 +16,3 @@ complete -c gunzip -s S -l suffix -r -d Suffix
 complete -c gunzip -s t -l test -d "Check integrity"
 complete -c gunzip -s v -l verbose -d "Display compression ratios"
 complete -c gunzip -s V -l version -d "Display version and exit"
-
diff --git a/share/completions/gv.fish b/share/completions/gv.fish
index 1afc24d94..1043ba4fa 100644
--- a/share/completions/gv.fish
+++ b/share/completions/gv.fish
@@ -47,4 +47,3 @@ complete -c gv -l widgetless -d 'Shortcut for --style=gv_widgetless.dat'
 complete -c gv -l fullscreen -d 'Start in fullscreen mode (needs support from WM)'
 complete -c gv -l presentation -d 'Presentation mode '
 complete -c gv -l version -d 'Show gv version and exit'
-
diff --git a/share/completions/gzip.fish b/share/completions/gzip.fish
index fc83f2eff..fe6e92678 100644
--- a/share/completions/gzip.fish
+++ b/share/completions/gzip.fish
@@ -20,4 +20,3 @@ complete -c gzip -s v -l verbose -d "Display compression ratios"
 complete -c gzip -s V -l version -d "Display version and exit"
 complete -c gzip -s 1 -l fast -d "Use fast setting"
 complete -c gzip -s 9 -l best -d "Use high compression setting"
-
diff --git a/share/completions/iconv.fish b/share/completions/iconv.fish
index be9f5959a..03ee36a0d 100644
--- a/share/completions/iconv.fish
+++ b/share/completions/iconv.fish
@@ -7,4 +7,3 @@ complete -c iconv -s o -l output -d "Output file" -r
 complete -c iconv -l verbose -d "Print progress information"
 complete -c iconv -l help -d "Display version and exit"
 complete -c iconv -l version -d "Display help and exit"
-
diff --git a/share/completions/id.fish b/share/completions/id.fish
index 9b015eb80..e32e9ecb7 100644
--- a/share/completions/id.fish
+++ b/share/completions/id.fish
@@ -5,4 +5,3 @@ complete -c id -s r -l real -d "Print real ID, not effective"
 complete -c id -s u -l user -d "Print effective user ID"
 complete -c id -l help -d "Display help and exit"
 complete -c id -l version -d "Display version and exit"
-
diff --git a/share/completions/iex.fish b/share/completions/iex.fish
index 1396db79a..a97c2a4d7 100644
--- a/share/completions/iex.fish
+++ b/share/completions/iex.fish
@@ -13,4 +13,4 @@ complete -f -c iex -l cookie -d "Sets a cookie for this distributed node"
 complete -f -c iex -l hidden -d "Makes a hidden node"
 complete -f -c iex -l detached -d "Starts the Erlang VM detached from console"
 complete -f -c iex -l remsh -d "Connects to a node using a remote shell"
-complete -c iex -l dot-iex -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
\ No newline at end of file
+complete -c iex -l dot-iex -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
diff --git a/share/completions/ifdata.fish b/share/completions/ifdata.fish
index af4a8a3e9..7041b9b32 100644
--- a/share/completions/ifdata.fish
+++ b/share/completions/ifdata.fish
@@ -28,4 +28,3 @@ complete -c ifdata -o soc -d 'Print # of out carrier loss'
 complete -c ifdata -o som -d 'Print # of out multicast'
 complete -c ifdata -o bips -d 'Print # of incoming bytes per second'
 complete -c ifdata -o bops -d 'Print # of outgoing bytes per second'
-
diff --git a/share/completions/latex.fish b/share/completions/latex.fish
index f72e04a7b..3d3f49202 100644
--- a/share/completions/latex.fish
+++ b/share/completions/latex.fish
@@ -1,2 +1 @@
 complete -c latex -w tex
-
diff --git a/share/completions/latexmk.fish b/share/completions/latexmk.fish
index 35e3b9493..1831a43ca 100644
--- a/share/completions/latexmk.fish
+++ b/share/completions/latexmk.fish
@@ -69,4 +69,3 @@ complete -c latexmk -o view=dvi -d 'viewer is for dvi'
 complete -c latexmk -o view=none -d 'no viewer is used'
 complete -c latexmk -o view=ps -d 'viewer is for ps'
 complete -c latexmk -o view=pdf -d 'viewer is for pdf'
-
diff --git a/share/completions/launchctl.fish b/share/completions/launchctl.fish
index 77e63e9ff..ba0b5c01d 100644
--- a/share/completions/launchctl.fish
+++ b/share/completions/launchctl.fish
@@ -42,4 +42,3 @@ complete --command launchctl -n __fish_use_subcommand -xa "error\tPrints a descr
 complete --command launchctl -n __fish_use_subcommand -xa "variant\tPrints the launchd variant"
 complete --command launchctl -n __fish_use_subcommand -xa "version\tPrints the launchd version"
 complete --command launchctl -n __fish_use_subcommand -xa "help\tPrints the usage for a given subcommand"
-
diff --git a/share/completions/less.fish b/share/completions/less.fish
index 626f098e1..b32b605c0 100644
--- a/share/completions/less.fish
+++ b/share/completions/less.fish
@@ -49,4 +49,3 @@ complete -c less -s z -l window -d "Max scroll window" -r -a "1 2 3 4 5 6 7 8 9
 complete -c less -s \" -l quotes -d "Set quote char" -r
 complete -c less -s \~ -l tilde -d "Lines after EOF are blank"
 complete -c less -s \# -l shift -d "Characters to scroll on left/right arrows" -a "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19"
-
diff --git a/share/completions/localectl.fish b/share/completions/localectl.fish
index 715ff86f7..0cb110cb5 100644
--- a/share/completions/localectl.fish
+++ b/share/completions/localectl.fish
@@ -35,4 +35,3 @@ complete -c localectl -s H -l host -d 'Execute the operation on a remote host'
 complete -c localectl -s h -l help -d 'Print a short help text and exit'
 complete -c localectl -l version -d 'Print a short version string and exit'
 complete -c localectl -l no-pager -d 'Do not pipe output into a pager'
-
diff --git a/share/completions/logkeys.fish b/share/completions/logkeys.fish
index 2e6b381a9..a3ed833b8 100644
--- a/share/completions/logkeys.fish
+++ b/share/completions/logkeys.fish
@@ -10,4 +10,3 @@ complete -c logkeys -l no-func-keys -d 'Log only character key presses'
 complete -c logkeys -l no-timestamps -d 'No timestamp to each line of log'
 complete -c logkeys -l post-size -d 'On SIZE, rotate current logfile'
 complete -c logkeys -l post-http -d 'POST the log file to URL'
-
diff --git a/share/completions/lp.fish b/share/completions/lp.fish
index 5e026919d..0945de61c 100644
--- a/share/completions/lp.fish
+++ b/share/completions/lp.fish
@@ -9,4 +9,3 @@ complete -c lp -s s -d 'Do not report the resulting job IDs (silent mode)'
 complete -c lp -s t -d 'Sets the job name' -x
 complete -c lp -s H -d 'Specifies  when the job should be printed' -xa 'hold immediate restart resume HH:MM'
 complete -c lp -s P -d 'Specify the page ranges' -x
-
diff --git a/share/completions/lpmove.fish b/share/completions/lpmove.fish
index 2911d8a2a..8a506b3be 100644
--- a/share/completions/lpmove.fish
+++ b/share/completions/lpmove.fish
@@ -1,2 +1 @@
 __fish_complete_lpr lpmove
-
diff --git a/share/completions/lpstat.fish b/share/completions/lpstat.fish
index ce33d2839..3a1effd2a 100644
--- a/share/completions/lpstat.fish
+++ b/share/completions/lpstat.fish
@@ -13,4 +13,3 @@ complete -c lpstat -s s -d 'Shows a status summary, including the default destin
 complete -c lpstat -s t -d 'Shows all status information'
 complete -c lpstat -s u -d 'Shows a list of print jobs queued by the specified users' -xa '(__fish_complete_users)'
 complete -c lpstat -s v -d 'Shows the printers and what device they are attached to' -xa '(__fish_print_lpr_printers)'
-
diff --git a/share/completions/lualatex.fish b/share/completions/lualatex.fish
index 279080671..22d515b32 100644
--- a/share/completions/lualatex.fish
+++ b/share/completions/lualatex.fish
@@ -1,2 +1 @@
 complete -c lualatex -w tex
-
diff --git a/share/completions/lxpanel.fish b/share/completions/lxpanel.fish
index fb97dada5..677ddc2f0 100644
--- a/share/completions/lxpanel.fish
+++ b/share/completions/lxpanel.fish
@@ -2,4 +2,3 @@ complete -c lxpanel -s h -l help -d 'print this help and exit'
 complete -c lxpanel -s v -l version -d 'print version and exit'
 complete -c lxpanel -s p -l profile -d 'use specified profile' -xa '(find ~/.config/lxpanel/ -maxdepth 1 -mindepth 1  -type d -printf "%f\n")'
 complete -c lxpanel -l log -r -d 'set log level 0-5. 0 - none 5 - chatty'
-
diff --git a/share/completions/make.fish b/share/completions/make.fish
index 52fa2b1f3..109af20f8 100644
--- a/share/completions/make.fish
+++ b/share/completions/make.fish
@@ -54,4 +54,3 @@ complete -c make -s t -d "Touch files, don't run commands"
 complete -c make -s v -d "Display version and exit"
 complete -c make -s w -d "Print working directory"
 complete -c make -s W -r -d "Pretend file is modified"
-
diff --git a/share/completions/makedepend.fish b/share/completions/makedepend.fish
index e3162843d..c7fef93f3 100644
--- a/share/completions/makedepend.fish
+++ b/share/completions/makedepend.fish
@@ -10,4 +10,3 @@ complete -c makedepend -s s -r -d "Starting string delimiter"
 complete -c makedepend -s w -r -d "Line width"
 complete -c makedepend -s v -d "Verbose mode"
 complete -c makedepend -s m -d "Warn about multiple inclusion"
-
diff --git a/share/completions/man.fish b/share/completions/man.fish
index a3ed418b0..dd749c5fb 100644
--- a/share/completions/man.fish
+++ b/share/completions/man.fish
@@ -34,4 +34,3 @@ complete -xc man -s p -d Preprocessors
 complete -c man -s t -d "Format for printing"
 complete -c man -s w -l path -d "Only print locations"
 complete -c man -s W -d "Only print locations"
-
diff --git a/share/completions/mkinitcpio.fish b/share/completions/mkinitcpio.fish
index cdc3898e4..903c91d50 100644
--- a/share/completions/mkinitcpio.fish
+++ b/share/completions/mkinitcpio.fish
@@ -23,4 +23,3 @@ complete -c mkinitcpio -s t -l builddir -d 'Use tmpdir as the temporary build di
 complete -c mkinitcpio -s V -l version -d 'Display version information'
 complete -c mkinitcpio -s v -l verbose -d 'Verbose output'
 complete -c mkinitcpio -s z -l compress -d 'Override the compression method with the compress program'
-
diff --git a/share/completions/modprobe.fish b/share/completions/modprobe.fish
index 4d431fec5..961a35bbe 100644
--- a/share/completions/modprobe.fish
+++ b/share/completions/modprobe.fish
@@ -20,4 +20,3 @@ complete -c modprobe -l set-version -d "Specify kernel version"
 complete -c modprobe -l show-depends -d "List dependencies of module"
 complete -c modprobe -s o -l name -d "Rename module"
 complete -c modprobe -l first-time -d "Fail if inserting already loaded module"
-
diff --git a/share/completions/msgfmt.fish b/share/completions/msgfmt.fish
index 422576db4..075c132ba 100644
--- a/share/completions/msgfmt.fish
+++ b/share/completions/msgfmt.fish
@@ -33,4 +33,3 @@ complete -c msgfmt -s h -l help -d "Display help and exit"
 complete -c msgfmt -s V -l version -d "Display version and exit"
 complete -c msgfmt -l statistics -d "Print statistics about translations"
 complete -c msgfmt -l verbose -d "Increase verbosity level"
-
diff --git a/share/completions/nice.fish b/share/completions/nice.fish
index 8b943a527..e0f30d001 100644
--- a/share/completions/nice.fish
+++ b/share/completions/nice.fish
@@ -5,4 +5,3 @@ complete -c nice -a "(__fish_complete_subcommand -- -n --adjustment)" -d Command
 complete -c nice -s n -l adjustment -n __fish_no_arguments -d "Add specified amount to niceness value" -x
 complete -c nice -l help -n __fish_no_arguments -d "Display help and exit"
 complete -c nice -l version -n __fish_no_arguments -d "Display version and exit"
-
diff --git a/share/completions/nm.fish b/share/completions/nm.fish
index ca94b5e59..44bde585d 100644
--- a/share/completions/nm.fish
+++ b/share/completions/nm.fish
@@ -26,4 +26,3 @@ complete -c nm -l target -d 'Specify the target object format as BFDNAME'
 complete -c nm -s u -l undefined-only -d 'Display only undefined symbols'
 complete -c nm -s h -l help -d 'Display this information'
 complete -c nm -s V -l version -d "Display this program's version number"
-
diff --git a/share/completions/oggenc.fish b/share/completions/oggenc.fish
index 6b816cb22..66f39ffea 100644
--- a/share/completions/oggenc.fish
+++ b/share/completions/oggenc.fish
@@ -30,4 +30,3 @@ complete -c oggenc -s t -l title -x -d "Title of track"
 complete -c oggenc -s l -l album -x -d "Name of album"
 complete -c oggenc -s a -l artist -x -d "Name of artist"
 complete -c oggenc -s G -l genre -x -d "Genre of track"
-
diff --git a/share/completions/omega.fish b/share/completions/omega.fish
index 13aba6c80..56428e8e1 100644
--- a/share/completions/omega.fish
+++ b/share/completions/omega.fish
@@ -1,2 +1 @@
 complete -c omega -w tex
-
diff --git a/share/completions/pandoc.fish b/share/completions/pandoc.fish
index 76f473402..d0efa54b8 100644
--- a/share/completions/pandoc.fish
+++ b/share/completions/pandoc.fish
@@ -131,4 +131,3 @@ complete -c pandoc -x -l reference-location -a "block section document"
 complete -c pandoc -x -l top-level-division -a "default section chapter part"
 complete -c pandoc -x -l email-obfuscation -a "none javascript references"
 complete -c pandoc -x -l pdf-engine -a "$pdfengines"
-
diff --git a/share/completions/pbget.fish b/share/completions/pbget.fish
index f525388d6..baf478436 100644
--- a/share/completions/pbget.fish
+++ b/share/completions/pbget.fish
@@ -7,4 +7,3 @@ complete -c pbget -l dir -d 'Set the output directory'
 complete -c pbget -l help -d 'Display this message'
 complete -c pbget -l upgradable -d 'Search for upgradable packages'
 complete -c pbget -l testing -d 'Search the ABS testing branches'
-
diff --git a/share/completions/pdfelatex.fish b/share/completions/pdfelatex.fish
index 9df0bf8e2..3366bb2f2 100644
--- a/share/completions/pdfelatex.fish
+++ b/share/completions/pdfelatex.fish
@@ -1,3 +1 @@
 complete -c pdfelatex -w tex
-
-
diff --git a/share/completions/pdfetex.fish b/share/completions/pdfetex.fish
index 60e1329e1..b6f0e558d 100644
--- a/share/completions/pdfetex.fish
+++ b/share/completions/pdfetex.fish
@@ -1,3 +1 @@
 complete -c pdfetex -w tex
-
-
diff --git a/share/completions/pdflatex.fish b/share/completions/pdflatex.fish
index 7f59bc364..5e3b1ffae 100644
--- a/share/completions/pdflatex.fish
+++ b/share/completions/pdflatex.fish
@@ -1,2 +1 @@
 complete -c pdflatex -w tex
-
diff --git a/share/completions/pdftex.fish b/share/completions/pdftex.fish
index 025a483cb..559a73bd1 100644
--- a/share/completions/pdftex.fish
+++ b/share/completions/pdftex.fish
@@ -1,3 +1 @@
 complete -c pdftex -w tex
-
-
diff --git a/share/completions/ping.fish b/share/completions/ping.fish
index 3b300c765..1eb1e2125 100644
--- a/share/completions/ping.fish
+++ b/share/completions/ping.fish
@@ -27,4 +27,3 @@ complete -c ping -s v -d "Verbose mode"
 complete -c ping -s V -d "Display version and exit"
 complete -c ping -s w -d "Specify  a timeout, in seconds, before ping exits regardless of how many packets have been sent or received" -x
 complete -c ping -s W -d "Time to wait for a response, in seconds" -x
-
diff --git a/share/completions/pkg_add.fish b/share/completions/pkg_add.fish
index e6bed374d..c064f46a2 100644
--- a/share/completions/pkg_add.fish
+++ b/share/completions/pkg_add.fish
@@ -6,4 +6,3 @@ complete -c pkg_add -o a -d 'Automated package installation'
 complete -c pkg_add -o h -d 'Print help'
 complete -c pkg_add -o u -d 'Update packages'
 complete -c pkg_add -o z -d 'Fuzzy match'
-
diff --git a/share/completions/pkgadd.fish b/share/completions/pkgadd.fish
index 69452488a..3acec016a 100644
--- a/share/completions/pkgadd.fish
+++ b/share/completions/pkgadd.fish
@@ -5,4 +5,3 @@ complete -c pkgadd -o f -l force -d 'Force installation, overwriting'
 complete -c pkgadd -o r -l root -d 'Alternative installation root'
 complete -c pkgadd -o v -l version -d 'Print version'
 complete -c pkgadd -o h -l help -d 'Print help'
-
diff --git a/share/completions/pkgmk.fish b/share/completions/pkgmk.fish
index c49dd6fe7..f05e36ef6 100644
--- a/share/completions/pkgmk.fish
+++ b/share/completions/pkgmk.fish
@@ -17,4 +17,3 @@ complete -f -c pkgmk -o kw -l keep-work -d 'Keep working dir'
 complete -f -c pkgmk -o cf -l config-file -r -d 'Use another config'
 complete -f -c pkgmk -o v -l version -d 'Print version'
 complete -f -c pkgmk -o h -l help -d 'Print help'
-
diff --git a/share/completions/ps.fish b/share/completions/ps.fish
index 5cfcb4e6b..f5a75c916 100644
--- a/share/completions/ps.fish
+++ b/share/completions/ps.fish
@@ -42,4 +42,3 @@ complete -c ps -s m -d 'Show threads after processes'
 complete -c ps -s V -l version -d "Display version and exit"
 complete -c ps -l help -d "Display help and exit"
 complete -c ps -l info -d "Display debug info"
-
diff --git a/share/completions/pydf.fish b/share/completions/pydf.fish
index 2fd44331e..24bb6941f 100644
--- a/share/completions/pydf.fish
+++ b/share/completions/pydf.fish
@@ -15,4 +15,3 @@ complete -c pydf -l bw -d 'do not use colours'
 complete -c pydf -l mounts -r -d 'file to get mount information from. On normal Linux systems only /etc/mtab or /proc/mounts make sense. Some other Unices use /etc/mnttab. Use /proc/mounts when /etc/mtab is corrupted or inaccessible (the output looks a bit weird in this case).'
 complete -c pydf -s B -l show-binds -d 'show \'mount --bind\' mounts'
 complete -c pydf -s i -l inodes -d 'show inode instead of block usage'
-
diff --git a/share/completions/reject.fish b/share/completions/reject.fish
index f2c330797..1f5bc0e99 100644
--- a/share/completions/reject.fish
+++ b/share/completions/reject.fish
@@ -1,3 +1,2 @@
 __fish_complete_lpr reject
 complete -c reject -s r -d 'Reject reason' -x
-
diff --git a/share/completions/rmdir.fish b/share/completions/rmdir.fish
index 52f68a672..cfdbf2913 100644
--- a/share/completions/rmdir.fish
+++ b/share/completions/rmdir.fish
@@ -5,4 +5,3 @@ complete -c rmdir -s p -l parents -d "Remove each component of path"
 complete -c rmdir -s v -l verbose -d "Verbose mode"
 complete -c rmdir -l help -d "Display help and exit"
 complete -c rmdir -l version -d "Display version and exit"
-
diff --git a/share/completions/ruby.fish b/share/completions/ruby.fish
index cc2586554..136c13b41 100644
--- a/share/completions/ruby.fish
+++ b/share/completions/ruby.fish
@@ -22,4 +22,3 @@ complete -c ruby -l version -d 'Display version and exit'
 complete -c ruby -s x -d 'Extract script'
 complete -c ruby -s X -x -a '(__fish_complete_directories (commandline -ct))' -d Directory
 complete -c ruby -s y -l yydebug -d 'Compiler debug mode'
-
diff --git a/share/completions/scanimage.fish b/share/completions/scanimage.fish
index 98f809ce9..06953c0b3 100644
--- a/share/completions/scanimage.fish
+++ b/share/completions/scanimage.fish
@@ -37,4 +37,3 @@ complete -c scanimage -s h -l help -d 'Display this help message and exit'
 complete -c scanimage -s v -l verbose -d 'Give even more status messages'
 complete -c scanimage -s B -l buffer-size -r -d 'Change input buffer size (in kB, default 32)'
 complete -c scanimage -s V -l version -d 'Print version information'
-
diff --git a/share/completions/scrot.fish b/share/completions/scrot.fish
index e4ea0488c..65830f201 100644
--- a/share/completions/scrot.fish
+++ b/share/completions/scrot.fish
@@ -9,4 +9,3 @@ complete -c scrot -s q -l quality -d 'Image quality [1-100]'
 complete -c scrot -s m -l multidisp -d 'Grab shot from multiple heads'
 complete -c scrot -s s -l select -d 'Select a window or rectangle with the mouse'
 complete -c scrot -s t -l thumb -d 'Generate thumbnail PERCENT of original'
-
diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 4076f6d5a..390354b39 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -24,4 +24,3 @@ complete -c setxkbmap -o synch -d 'Synchronize request w/X server'
 complete -c setxkbmap -o types -d 'Specifies types component name' -xa "(sed -r $filter /usr/share/X11/xkb/types.dir)"
 complete -c setxkbmap -o v -o verbose -d 'Sets verbosity (1..10).  Higher values yield more messages' -xa '(seq 1 10)'
 complete -c setxkbmap -o variant -d 'Specifies layout variant used to choose component names' -xa "(__fish_complete_setxkbmap variant)"
-
diff --git a/share/completions/sort.fish b/share/completions/sort.fish
index 967627703..c6385561e 100644
--- a/share/completions/sort.fish
+++ b/share/completions/sort.fish
@@ -22,4 +22,3 @@ complete -c sort -s u -l unique -d "Output only first of equal lines"
 complete -c sort -s z -l zero-terminated -d "Lines end with 0 byte"
 complete -c sort -l help -d "Display help and exit"
 complete -c sort -l version -d "Display version and exit"
-
diff --git a/share/completions/sshfs.fish b/share/completions/sshfs.fish
index 78d75d0a1..c9beed6ce 100644
--- a/share/completions/sshfs.fish
+++ b/share/completions/sshfs.fish
@@ -18,4 +18,3 @@ complete -c sshfs -s f -d "Foreground operation"
 complete -c sshfs -s s -d "Disable multi-threaded operation"
 complete -c sshfs -s r -d "Mount options"
 complete -c sshfs -s h -d "Display help and exit"
-
diff --git a/share/completions/stat.fish b/share/completions/stat.fish
index 88ba989ba..67d34c375 100644
--- a/share/completions/stat.fish
+++ b/share/completions/stat.fish
@@ -17,4 +17,4 @@ else # OS X
     complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
     complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
     complete -c stat -s x -d "Verbose information, similar to some Linux distributions"
-end
\ No newline at end of file
+end
diff --git a/share/completions/status.fish b/share/completions/status.fish
index 5f14db569..4e584c7b6 100644
--- a/share/completions/status.fish
+++ b/share/completions/status.fish
@@ -34,4 +34,3 @@ complete -f -c status -n "not __fish_seen_subcommand_from $__fish_status_all_com
 complete -f -c status -n "__fish_seen_subcommand_from job-control" -a full -d "Set all jobs under job control"
 complete -f -c status -n "__fish_seen_subcommand_from job-control" -a interactive -d "Set only interactive jobs under job control"
 complete -f -c status -n "__fish_seen_subcommand_from job-control" -a none -d "Set no jobs under job control"
-
diff --git a/share/completions/sylpheed.fish b/share/completions/sylpheed.fish
index c66e20cf7..fbd0269b8 100644
--- a/share/completions/sylpheed.fish
+++ b/share/completions/sylpheed.fish
@@ -13,4 +13,3 @@ complete -r -c sylpheed -l send -d 'Send all queued messages'
 complete -r -c sylpheed -l status -d 'Show the total number of messages for folder'
 complete -r -c sylpheed -l status-full -d 'Show the total number of messages for each folder'
 complete -r -c sylpheed -l configdir -d 'Specify directory with configuration files'
-
diff --git a/share/completions/systemd-nspawn.fish b/share/completions/systemd-nspawn.fish
index 773d39b78..c26b1923e 100644
--- a/share/completions/systemd-nspawn.fish
+++ b/share/completions/systemd-nspawn.fish
@@ -38,4 +38,3 @@ complete -c systemd-nspawn -s h -l help -d 'Print a short help text and exit'
 complete -c systemd-nspawn -l version -d 'Print a short version string and exit'
 # Not quite correct, but otherwise we'd need to get the machine root, and we can't always know that
 complete -c systemd-nspawn -n "__fish_not_contain_opt -s b boot" -a "(__fish_complete_subcommand)" -f
-
diff --git a/share/completions/tig.fish b/share/completions/tig.fish
index 5343e28d6..9c500fe33 100644
--- a/share/completions/tig.fish
+++ b/share/completions/tig.fish
@@ -25,4 +25,3 @@ complete -c tig -n 'not contains -- -- (commandline -opc) && __fish_seen_subcomm
 
 complete -c tig -f -n 'not contains -- -- (commandline -opc)' -a '(__fish_git_ranges)'
 complete -c tig -n 'contains -- -- (commandline -opc)' -F
-
diff --git a/share/completions/top.fish b/share/completions/top.fish
index c188af24c..feb8c946d 100644
--- a/share/completions/top.fish
+++ b/share/completions/top.fish
@@ -11,4 +11,3 @@ complete -c top -s p -d "Monitor PID" -x -a "(__fish_complete_pids)"
 complete -c top -s s -d "Secure mode"
 complete -c top -s S -d "Cumulative mode"
 complete -c top -s v -d "Display version and exit"
-
diff --git a/share/completions/touch.fish b/share/completions/touch.fish
index 0e6015083..7f0a2e40e 100644
--- a/share/completions/touch.fish
+++ b/share/completions/touch.fish
@@ -19,4 +19,4 @@ else # OS X
     complete -c touch -s m -d "Change modification time of file"
     complete -c touch -s r -d "Use access and modifications times from specified file rather than current time of day"
     complete -c touch -s t -d "Change access and modifications times to specified file rather than current time of day"
-end
\ No newline at end of file
+end
diff --git a/share/completions/udevadm.fish b/share/completions/udevadm.fish
index c3370a8e4..7a2044ef6 100644
--- a/share/completions/udevadm.fish
+++ b/share/completions/udevadm.fish
@@ -60,4 +60,3 @@ complete -c udevadm -n '__fish_seen_subcommand_from test' -s N -l resolve-names
 
 # udevadm test-builtin
 complete -c udevadm -n '__fish_seen_subcommand_from test-builtin; and __fish_is_nth_token 2' -xa "blkid\t'Filesystem and partition probing' btrfs\t'btrfs volume management' hwdb\t'Hardware database' input_id\t'Input device properties' keyboard\t'Keybord scan code to key mapping' kmod\t'Kernel module loader' net_id\t'Network device properties' net_setup_link\t'Configure network link' path_id\t'Compose persistent device path' usb_id\t'USB device properties' uaccess\t'Manage device node user ACL'"
-
diff --git a/share/completions/umount.fish b/share/completions/umount.fish
index d96ffa763..fedf007d4 100644
--- a/share/completions/umount.fish
+++ b/share/completions/umount.fish
@@ -19,4 +19,3 @@ complete -c umount -s t -d "Actions should only be taken on file systems of the
 complete -c umount -s O -d "Actions should only be taken on file systems with the specified options in /etc/fstab" -xa '(cut -d " " -f 4 /etc/mtab)\t"Mount option"'
 complete -c umount -s f -d "Force unmount (in case of an unreachable NFS system)"
 complete -c umount -s l -d "Detach the filesystem from the filesystem hierarchy now, and cleanup all references to the filesystem as soon as it is not busy"
-
diff --git a/share/completions/unrar.fish b/share/completions/unrar.fish
index da1e65257..b1a57c16b 100644
--- a/share/completions/unrar.fish
+++ b/share/completions/unrar.fish
@@ -28,4 +28,3 @@ complete -x -c unrar -n __fish_use_subcommand -a v -d "Verbosely list archive"
 complete -x -c unrar -n __fish_use_subcommand -a vt -d "Verbosely list archive (technical)"
 complete -x -c unrar -n __fish_use_subcommand -a vb -d "Verbosely list archive (bare)"
 complete -x -c unrar -n __fish_use_subcommand -a x -d "Extract files with full path"
-
diff --git a/share/completions/vim-addons.fish b/share/completions/vim-addons.fish
index 254b5d2ca..09e628b7c 100644
--- a/share/completions/vim-addons.fish
+++ b/share/completions/vim-addons.fish
@@ -51,4 +51,3 @@ complete -c vim-addons -s t -l target-dir -d "set the addons target directory"
 complete -c vim-addons -s v -l verbose -d "increase verbosity"
 complete -c vim-addons -s y -l system-dir -d "set the system-wide target directory"
 complete -c vim-addons -s w -l system-wide -d "set target directory to the system-wide one"
-
diff --git a/share/completions/vmctl.fish b/share/completions/vmctl.fish
index 2edb21693..154ef75f8 100644
--- a/share/completions/vmctl.fish
+++ b/share/completions/vmctl.fish
@@ -8,4 +8,3 @@ end
 
 complete -c vmctl -xa 'console create load log reload reset start status stop pause unpause send receive' -n 'not __fish_seen_subcommand_from list console create load log reload reset start status stop pause unpause send receive'
 complete -c vmctl -n '__fish_seen_subcommand_from console reload reset start status stop pause unpause send receive' -xa (__fish_get_vmctl_vms)
-
diff --git a/share/completions/watch.fish b/share/completions/watch.fish
index 346b78b2c..d308e22a2 100644
--- a/share/completions/watch.fish
+++ b/share/completions/watch.fish
@@ -11,4 +11,3 @@ complete -c watch -s x -l exec -d 'Pass command to exec instead of "sh -c"'
 complete -c watch -s h -l help -d 'Display this help and exit'
 complete -c watch -s v -l version -d 'Output version information and exit'
 complete -c watch -xa '(__fish_complete_subcommand -- -n --interval)'
-
diff --git a/share/completions/wget.fish b/share/completions/wget.fish
index f16c0959d..c9d89afdb 100644
--- a/share/completions/wget.fish
+++ b/share/completions/wget.fish
@@ -130,4 +130,3 @@ complete -c wget -s I -l include-directories -d "Specify a comma-separated list
 complete -c wget -s X -l exclude-directories -d "Specify a comma-separated list of directories you wish to exclude" -x
 complete -c wget -l no-parent -d "Do not ever ascend to the parent directory"
 complete -c wget -o np -d "Do not ever ascend to the parent directory"
-
diff --git a/share/completions/who.fish b/share/completions/who.fish
index fd0fbeead..a185659e0 100644
--- a/share/completions/who.fish
+++ b/share/completions/who.fish
@@ -17,4 +17,3 @@ complete -c who -l message -d "Print users message status as +, - or ?"
 complete -c who -s u -l users -d "List users logged in"
 complete -c who -l help -d "Display help and exit"
 complete -c who -l version -d "Display version and exit"
-
diff --git a/share/completions/wicd-client.fish b/share/completions/wicd-client.fish
index ddc39eb99..e2a14792c 100644
--- a/share/completions/wicd-client.fish
+++ b/share/completions/wicd-client.fish
@@ -3,4 +3,3 @@ complete -c wicd-client -s n -l no-tray -d 'Run wicd without the tray icon.'
 complete -c wicd-client -s h -l help -d 'Print this help information.'
 complete -c wicd-client -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-client -s o -l only-notifications -d 'Don\'t display anything except notifications.'
-
diff --git a/share/completions/wicd-gtk.fish b/share/completions/wicd-gtk.fish
index f204b60c6..7195f0d4f 100644
--- a/share/completions/wicd-gtk.fish
+++ b/share/completions/wicd-gtk.fish
@@ -3,4 +3,3 @@ complete -c wicd-gtk -s n -l no-tray -d 'Run wicd without the tray icon.'
 complete -c wicd-gtk -s h -l help -d 'Print this help information.'
 complete -c wicd-gtk -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-gtk -s o -l only-notifications -d 'Don\'t display anything except notifications.'
-
diff --git a/share/completions/xbps-alternatives.fish b/share/completions/xbps-alternatives.fish
index 3310c7b3f..3f2bcb6dd 100644
--- a/share/completions/xbps-alternatives.fish
+++ b/share/completions/xbps-alternatives.fish
@@ -17,4 +17,3 @@ complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s V -d 'Show the version information.'
 complete -c $progname -s l -n "not __fish_contains_opt -s s" -d 'Lists all current alternative groups or only from PKG, or just a specific group with -g.'
 complete -c $progname -s s -n "not __fish_contains_opt -s l" -d 'Set alternative groups specified by PKG or just a specific group with -g.'
-
diff --git a/share/completions/xbps-checkvers.fish b/share/completions/xbps-checkvers.fish
index 00c6dd3a3..5131e8fdd 100644
--- a/share/completions/xbps-checkvers.fish
+++ b/share/completions/xbps-checkvers.fish
@@ -15,4 +15,3 @@ complete -c $progname -s R -d 'Repository to be added to the top of the list.'
 complete -c $progname -s r -d 'Specifies a full path for the target root directory.' -xa "(__fish_complete_directories)"
 complete -c $progname -s s -d 'List all packages found in the void-packages tree and prints available version.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-create.fish b/share/completions/xbps-create.fish
index 54d4939f9..4f4cee7b6 100644
--- a/share/completions/xbps-create.fish
+++ b/share/completions/xbps-create.fish
@@ -33,4 +33,3 @@ complete -c $progname -l shlib-provides -d 'A list of provided shared libraries,
 complete -c $progname -l shlib-requires -d 'A list of required shared libraries, separated by whitespaces.' -x
 complete -c $progname -l alternatives -d 'A list of alternatives provided by this package, separated by whitespaces.' -x
 complete -c $progname -s c -d 'The package changelog string.' -x
-
diff --git a/share/completions/xbps-dgraph.fish b/share/completions/xbps-dgraph.fish
index 956884360..b56fb270a 100644
--- a/share/completions/xbps-dgraph.fish
+++ b/share/completions/xbps-dgraph.fish
@@ -18,4 +18,3 @@ complete -c $progname -s V -d 'Show the version information.'
 complete -c $progname -s g -n "not __fish_contains_opt -s f" -n "not __fish_contains_opt -s m" -d 'Generates a graph configuration file in the current working directory.'
 complete -c $progname -s f -n "not __fish_contains_opt -s m" -n "not __fish_contains_opt -s g" -d 'Generates a full dependency graph of the target package.'
 complete -c $progname -s m -n "not __fish_contains_opt -s f" -n "not __fish_contains_opt -s g" -d 'Generates a metadata graph of the target package.' # TODO: kinda fix this, can't exactly figure out how to make these last 3 modes mutually exclusive
-
diff --git a/share/completions/xbps-digest.fish b/share/completions/xbps-digest.fish
index 21bd14567..0e11eba63 100644
--- a/share/completions/xbps-digest.fish
+++ b/share/completions/xbps-digest.fish
@@ -7,4 +7,3 @@ set -l modes sha256
 complete -c $progname -s m -d 'Sets the message digest mode. If unset, defaults to sha256' -xa "$modes"
 complete -c $progname -s h -d 'Show the help message.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-fetch.fish b/share/completions/xbps-fetch.fish
index 0d0a8c85c..003cf24e6 100644
--- a/share/completions/xbps-fetch.fish
+++ b/share/completions/xbps-fetch.fish
@@ -10,4 +10,3 @@ complete -c $progname -s h -d 'Show the help message.'
 complete -c $progname -s o -d 'Rename file from specified URL to output.' -F
 complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-install.fish b/share/completions/xbps-install.fish
index d95729af1..5f073c926 100644
--- a/share/completions/xbps-install.fish
+++ b/share/completions/xbps-install.fish
@@ -28,4 +28,3 @@ complete -c $progname -s u -d 'Performs a full system upgrade (except for packag
 complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s y -d 'Assume yes to all questions and avoid interactive questions.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-pkgdb.fish b/share/completions/xbps-pkgdb.fish
index fad797319..1115aaea4 100644
--- a/share/completions/xbps-pkgdb.fish
+++ b/share/completions/xbps-pkgdb.fish
@@ -16,4 +16,3 @@ complete -c $progname -s r -d 'Specifies a full path for the target root directo
 complete -c $progname -s u -d 'Updates the pkgdb format to the latest version making the necessary conversions.'
 complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-reconfigure.fish b/share/completions/xbps-reconfigure.fish
index bc46823e3..8d2661f21 100644
--- a/share/completions/xbps-reconfigure.fish
+++ b/share/completions/xbps-reconfigure.fish
@@ -17,4 +17,3 @@ complete -c $progname -s i -n "__fish_contains_opt -s a" -d 'Ignore PKG when con
 complete -c $progname -s r -d 'Specifies a path for the target root directory.' -xa "(__fish_complete_directories)"
 complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-remove.fish b/share/completions/xbps-remove.fish
index d6c267f72..e5466d37e 100644
--- a/share/completions/xbps-remove.fish
+++ b/share/completions/xbps-remove.fish
@@ -22,4 +22,3 @@ complete -c $progname -s r -d 'Specifies a full path for the target root directo
 complete -c $progname -s v -d 'Enables verbose messages.'
 complete -c $progname -s y -d 'Assume yes to all questions and avoid interactive questions.'
 complete -c $progname -s V -d 'Show the version information.'
-
diff --git a/share/completions/xbps-uchroot.fish b/share/completions/xbps-uchroot.fish
index 6394276f9..fc7733107 100644
--- a/share/completions/xbps-uchroot.fish
+++ b/share/completions/xbps-uchroot.fish
@@ -9,4 +9,3 @@ complete -c $progname -s b -d 'Bind mounts src into CHROOTDIR/dest.' -F
 complete -c $progname -s O -d 'Setups a temporary directory and then creates an overlay layer (via overlayfs).'
 complete -c $progname -s o -d 'Arguments passed to the tmpfs mount, if the O and t options are specified.'
 complete -c $progname -s t -d 'This makes the temporary directory to be mounted in tmpfs, so that everything is stored in RAM. Used only with -O.'
-
diff --git a/share/completions/xelatex.fish b/share/completions/xelatex.fish
index 09098fbfc..48a91ab9e 100644
--- a/share/completions/xelatex.fish
+++ b/share/completions/xelatex.fish
@@ -1,2 +1 @@
 complete -c xelatex -w latex
-
diff --git a/share/completions/xmms.fish b/share/completions/xmms.fish
index 560b78eb7..0983307da 100644
--- a/share/completions/xmms.fish
+++ b/share/completions/xmms.fish
@@ -13,4 +13,4 @@ complete -c xmms -s t -l play-pause -d "Pause if playing, play otherwise"
 complete -c xmms -s f -l fwd -d "Skip forward in playlist"
 complete -c xmms -s e -l enqueue -d "Don't clear the playlist"
 complete -c xmms -s m -l show-main-window -d "Show the main window"
-complete -c xmms -s v -l version -d "Print the version number and exit"
\ No newline at end of file
+complete -c xmms -s v -l version -d "Print the version number and exit"
diff --git a/share/completions/xterm.fish b/share/completions/xterm.fish
index b8c254d73..d30f2c9cd 100644
--- a/share/completions/xterm.fish
+++ b/share/completions/xterm.fish
@@ -133,4 +133,3 @@ complete -c xterm -s l -d 'Turn on logging'
 complete -c xterm -s s -d 'Turn on asynchronous scrolling'
 complete -c xterm -s t -d 'Tektronix mode'
 complete -c xterm -s C -d 'This window should receive console output'
-
diff --git a/share/completions/yast2.fish b/share/completions/yast2.fish
index cf638f016..a2a13059c 100644
--- a/share/completions/yast2.fish
+++ b/share/completions/yast2.fish
@@ -8,4 +8,3 @@ complete -f -c yast2 -l ncurses -d 'Use the NCURSES text-mode user interface'
 complete -f -c yast2 -s g -l geometry -d 'Default window size (qt only)'
 complete -f -c yast2 -l noborder -d 'No window manager border for main window'
 complete -f -c yast2 -l fullscreen -d 'Use full screen'
-
diff --git a/share/completions/zcat.fish b/share/completions/zcat.fish
index 8ec919e80..9487bb42f 100644
--- a/share/completions/zcat.fish
+++ b/share/completions/zcat.fish
@@ -7,4 +7,3 @@ complete -c zcat -s f -l force -d Overwrite
 complete -c zcat -s h -l help -d "Display help and exit"
 complete -c zcat -s L -l license -d "Print license"
 complete -c zcat -s V -l version -d "Display version and exit"
-
diff --git a/share/functions/N_.fish b/share/functions/N_.fish
index cf4a0ed34..efdb266c1 100644
--- a/share/functions/N_.fish
+++ b/share/functions/N_.fish
@@ -3,4 +3,3 @@
 function N_ --description No-op
     printf "%s" $argv
 end
-
diff --git a/share/functions/__fish_append.fish b/share/functions/__fish_append.fish
index ea6332344..1c1a9deeb 100644
--- a/share/functions/__fish_append.fish
+++ b/share/functions/__fish_append.fish
@@ -3,5 +3,3 @@ function __fish_append -d "Internal completion function for appending string to
     set -l str (commandline -tc | string replace -rf "(.*$sep)[^$sep]*" '$1' | string replace -r -- '--.*=' '')
     printf "%s\n" "$str"$argv
 end
-
-
diff --git a/share/functions/__fish_complete_clang.fish b/share/functions/__fish_complete_clang.fish
index 33adef08c..7e7a4b897 100644
--- a/share/functions/__fish_complete_clang.fish
+++ b/share/functions/__fish_complete_clang.fish
@@ -13,4 +13,3 @@ function __fish_complete_clang
     # and put it in a format that fish understands
     string replace -r -- '^([^ ]+)\s*(.*)' "$prefix\$1\t\$2"
 end
-
diff --git a/share/functions/__fish_complete_lpr.fish b/share/functions/__fish_complete_lpr.fish
index f594147f6..eb157a392 100644
--- a/share/functions/__fish_complete_lpr.fish
+++ b/share/functions/__fish_complete_lpr.fish
@@ -35,4 +35,3 @@ function __fish_complete_lpr -d 'Complete lpr common options' --argument-names c
             complete -c $cmd -s o -xa 'page-bottom= page-left= page-right= page-top=' -d 'Set the page margins when printing text files'
     end
 end
-
diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index 318e9a211..2eafde97e 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -99,4 +99,3 @@ function __fish_complete_man
     end
     return 0
 end
-
diff --git a/share/functions/__fish_complete_netcat.fish b/share/functions/__fish_complete_netcat.fish
index c0437f66e..f0b1d1794 100644
--- a/share/functions/__fish_complete_netcat.fish
+++ b/share/functions/__fish_complete_netcat.fish
@@ -80,4 +80,3 @@ function __fish_complete_netcat
             complete -c $nc -s T -x -a "Minimize-Delay Maximize-Throughput Maximize-Reliability Minimize-Cost" -x -d "set TOS flag"
     end
 end
-
diff --git a/share/functions/__fish_complete_pids.fish b/share/functions/__fish_complete_pids.fish
index a9c5547e0..da3291165 100644
--- a/share/functions/__fish_complete_pids.fish
+++ b/share/functions/__fish_complete_pids.fish
@@ -7,4 +7,3 @@ function __fish_complete_pids -d "Print a list of process identifiers along with
     # But not if it's just question marks, meaning no tty
     __fish_ps -o pid,comm,tty | string match -r -v '^\s*'$fish_pid'\s' | tail -n +2 | string replace -r ' *([0-9]+) +([^ ].*[^ ]|[^ ]) +([^ ]+) *$' '$1\t$2 [$3]' | string replace -r ' *\[\?*\] *$' ''
 end
-
diff --git a/share/functions/__fish_complete_user_at_hosts.fish b/share/functions/__fish_complete_user_at_hosts.fish
index 4420f92fc..4d3a11be1 100644
--- a/share/functions/__fish_complete_user_at_hosts.fish
+++ b/share/functions/__fish_complete_user_at_hosts.fish
@@ -2,4 +2,4 @@ function __fish_complete_user_at_hosts -d "Print list host-names with user@"
     for user_at in (commandline -ct | string match -r '.*@'; or echo "")(__fish_print_hostnames)
         echo $user_at
     end
-end
\ No newline at end of file
+end
diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index c8baea981..7dfcaa166 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -38,4 +38,3 @@ function __fish_describe_command -d "Command used to find descriptions for comma
 			}
 	}'
 end
-
diff --git a/share/functions/__fish_gnu_complete.fish b/share/functions/__fish_gnu_complete.fish
index 3411f6774..d49bcbdfa 100644
--- a/share/functions/__fish_gnu_complete.fish
+++ b/share/functions/__fish_gnu_complete.fish
@@ -49,4 +49,3 @@ function __fish_gnu_complete -d "Wrapper for the complete built-in. Skips the lo
     complete $argv
 
 end
-
diff --git a/share/functions/__fish_is_first_token.fish b/share/functions/__fish_is_first_token.fish
index 297d7d341..6fdd4030d 100644
--- a/share/functions/__fish_is_first_token.fish
+++ b/share/functions/__fish_is_first_token.fish
@@ -13,4 +13,3 @@ function __fish_is_first_token -d 'Test if no non-switch argument has been speci
     end
     return 0
 end
-
diff --git a/share/functions/__fish_move_last.fish b/share/functions/__fish_move_last.fish
index e88ac8661..abb9a7793 100644
--- a/share/functions/__fish_move_last.fish
+++ b/share/functions/__fish_move_last.fish
@@ -25,4 +25,3 @@ function __fish_move_last -d "Move the last element of a directory history from
     # All ok, return success
     return 0
 end
-
diff --git a/share/functions/__fish_no_arguments.fish b/share/functions/__fish_no_arguments.fish
index cb21fcf96..3be1f43de 100644
--- a/share/functions/__fish_no_arguments.fish
+++ b/share/functions/__fish_no_arguments.fish
@@ -12,4 +12,3 @@ function __fish_no_arguments -d "Internal fish function"
     end
     return 0
 end
-
diff --git a/share/functions/__fish_npm_helper.fish b/share/functions/__fish_npm_helper.fish
index 784c39608..706563219 100644
--- a/share/functions/__fish_npm_helper.fish
+++ b/share/functions/__fish_npm_helper.fish
@@ -88,5 +88,3 @@ print("\n".join(data["dependencies"])); print("\n".join(data["devDependencies"])
         end
     end
 end
-
-
diff --git a/share/functions/__fish_number_of_cmd_args_wo_opts.fish b/share/functions/__fish_number_of_cmd_args_wo_opts.fish
index 83e3d2fa2..62357b06b 100644
--- a/share/functions/__fish_number_of_cmd_args_wo_opts.fish
+++ b/share/functions/__fish_number_of_cmd_args_wo_opts.fish
@@ -1,4 +1,3 @@
 function __fish_number_of_cmd_args_wo_opts
     count (__fish_print_cmd_args_without_options)
 end
-
diff --git a/share/functions/__fish_print_addresses.fish b/share/functions/__fish_print_addresses.fish
index 1bb6cd7a7..a5270ac88 100644
--- a/share/functions/__fish_print_addresses.fish
+++ b/share/functions/__fish_print_addresses.fish
@@ -8,4 +8,3 @@ function __fish_print_addresses --description "Print a list of known network add
         ifconfig | awk '/^\tinet/ { print $2 } '
     end
 end
-
diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 6c23d23c2..5fd89237b 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -25,4 +25,3 @@ function __fish_seen_argument
 
     return 1
 end
-
diff --git a/share/functions/__fish_use_subcommand.fish b/share/functions/__fish_use_subcommand.fish
index dd262c15f..a2b84c5ff 100644
--- a/share/functions/__fish_use_subcommand.fish
+++ b/share/functions/__fish_use_subcommand.fish
@@ -11,4 +11,3 @@ function __fish_use_subcommand -d "Test if a non-switch argument has been given
     end
     return 0
 end
-
diff --git a/share/functions/__fish_whatis.fish b/share/functions/__fish_whatis.fish
index 2a4eebc56..6851a4db0 100644
--- a/share/functions/__fish_whatis.fish
+++ b/share/functions/__fish_whatis.fish
@@ -18,4 +18,3 @@ function __fish_whatis
         return 1
     end
 end
-
diff --git a/share/functions/contains_seq.fish b/share/functions/contains_seq.fish
index d3a20e1c8..ff82720ba 100644
--- a/share/functions/contains_seq.fish
+++ b/share/functions/contains_seq.fish
@@ -43,4 +43,3 @@ function contains_seq --description 'Return true if array contains a sequence'
     end
     set -q printnext[2]
 end
-
diff --git a/share/functions/delete-or-exit.fish b/share/functions/delete-or-exit.fish
index 5a83ab8ac..70c94f140 100644
--- a/share/functions/delete-or-exit.fish
+++ b/share/functions/delete-or-exit.fish
@@ -20,4 +20,3 @@ function delete-or-exit
     end
 
 end
-
diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish
index 43bcb79b3..8c847fdf9 100644
--- a/share/functions/fish_default_mode_prompt.fish
+++ b/share/functions/fish_default_mode_prompt.fish
@@ -23,4 +23,3 @@ function fish_default_mode_prompt --description "Display the default mode for th
         echo -n ' '
     end
 end
-
diff --git a/share/functions/fish_print_hg_root.fish b/share/functions/fish_print_hg_root.fish
index 5942a9483..65625f9ea 100644
--- a/share/functions/fish_print_hg_root.fish
+++ b/share/functions/fish_print_hg_root.fish
@@ -21,4 +21,3 @@ function fish_print_hg_root
 
     return 1
 end
-
diff --git a/share/functions/funcsave.fish b/share/functions/funcsave.fish
index d81bcc118..74dad956b 100644
--- a/share/functions/funcsave.fish
+++ b/share/functions/funcsave.fish
@@ -36,4 +36,3 @@ function funcsave --description "Save the current definition of all specified fu
 
     return $retval
 end
-
diff --git a/share/functions/la.fish b/share/functions/la.fish
index 355e1f83a..bd2024ce7 100644
--- a/share/functions/la.fish
+++ b/share/functions/la.fish
@@ -4,4 +4,3 @@
 function la --description "List contents of directory, including hidden files in directory using long format"
     ls -lah $argv
 end
-
diff --git a/share/functions/prevd-or-backward-word.fish b/share/functions/prevd-or-backward-word.fish
index 5f0c740ed..2aaee3b51 100644
--- a/share/functions/prevd-or-backward-word.fish
+++ b/share/functions/prevd-or-backward-word.fish
@@ -7,4 +7,3 @@ function prevd-or-backward-word
         commandline -f backward-word
     end
 end
-