diff --git a/awit-ssh b/awit-ssh
index af29ee20781edad6307f2d9899694ebea80a9039..6df577f8c781ac5e36e4a629cec3695a13ba89bb 100755
--- a/awit-ssh
+++ b/awit-ssh
@@ -76,7 +76,7 @@ use User::pwent;
 
 
 my $NAME = "AWIT-SSH-Client";
-our $VERSION = "0.8.5";
+our $VERSION = "0.8.6";
 
 
 print(STDERR "$NAME v$VERSION - Copyright (c) 2016-2017, AllWorldIT\n\n");
@@ -88,50 +88,52 @@ C<awit-ssh> provides the below commandline options...
 
 =cut
 
-
-# Grab options
-my %optctl = ();
-GetOptions(\%optctl,
-
 =head2 --help|?
 
 	Display this help information.
 
 =cut
-	"help|?",
 
 =head2 --version
 
 	Display version information.
 
 =cut
-	"version",
-
-	# TODO: debug is not implemented, make sure displayHelp is updated
-	"debug",
-
-	# TODO: Improve globbing before adding it to displayHelp
-	"globbing",
 
 =head2 --knock <HOST:PORT>
 
 	Knock on HOST:PORT to gain access.
 
 =cut
-	"knock=s",
 
 =head2 --rsync remote://<HOST[:PORT]>/full/path DEST
 
 	Use rsync to rsync data from remote server to DEST. This can be specified either way around.
 
 =cut
-	"rsync",
 
 =head2 --libvirt-vnc <HOST:PORT>
 
 	Connect to remote VNC server HOST:PORT.
 
 =cut
+
+# Grab options
+my %optctl = ();
+GetOptions(\%optctl,
+	"help|?",
+	"version",
+
+	# TODO: debug is not implemented, make sure displayHelp is updated
+	"debug",
+
+	# TODO: Improve globbing before adding it to displayHelp
+	"globbing",
+
+	"knock=s",
+
+	"rsync",
+
 	"libvirt-vnc=s",
 ) or exit 1;