diff --git a/gtk-vnc.rb b/gtk-vnc.rb
index 588cc3e..46c775c 100644
--- a/gtk-vnc.rb
+++ b/gtk-vnc.rb
@@ -20,7 +20,7 @@ class GtkVnc < Formula
   depends_on "libgpg-error"
   depends_on "pango"
   # TODO: sound
-  #depends_on "pulseaudio"
+  # depends_on "pulseaudio"
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/libosinfo.rb b/libosinfo.rb
index 46c0e86..1124805 100644
--- a/libosinfo.rb
+++ b/libosinfo.rb
@@ -3,13 +3,13 @@ class Libosinfo < Formula
   url "https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.12.tar.gz"
   sha256 "fa00ea8ddbca06c0dcc31e8938ac55cb71e71c6e2449687cd2c9e003a9478fed"
 
-  depends_on "pkg-config" => :build
-  depends_on "intltool" => :build
   depends_on "gobject-introspection" => :build
+  depends_on "intltool" => :build
+  depends_on "pkg-config" => :build
 
   depends_on "check"
+  depends_on "libsoup-with-gnome"
   depends_on "libxml2"
-  depends_on "libsoup-with-gnome" => "with-gobject-introspection"
 
   patch :DATA # remove unknown linker option: --no-undefined
 
@@ -18,7 +18,6 @@ class Libosinfo < Formula
                           "--disable-silent-rules",
                           "--enable-introspection",
                           "--prefix=#{prefix}"
-
     system "make", "install"
   end
 end
diff --git a/libsoup-with-gnome.rb b/libsoup-with-gnome.rb
index 7a98259..69a47f8 100644
--- a/libsoup-with-gnome.rb
+++ b/libsoup-with-gnome.rb
@@ -4,24 +4,21 @@ class LibsoupWithGnome < Formula
   url "https://download.gnome.org/sources/libsoup/2.52/libsoup-2.52.0.tar.xz"
   sha256 "6c6c366622a1a9d938e0cea9b557fa536f088784251d31381ccd1b115a466785"
 
-  depends_on "pkg-config" => :build
+  depends_on "gobject-introspection" => :build
   depends_on "intltool" => :build
+  depends_on "pkg-config" => :build
+  depends_on "vala" => :build
+
   depends_on "glib-networking"
   depends_on "gnutls"
   depends_on "sqlite"
-  depends_on "gobject-introspection"
-  depends_on "vala"
 
   def install
-    args = [
-      "--disable-debug",
-      "--disable-dependency-tracking",
-      "--disable-silent-rules",
-      "--prefix=#{prefix}",
-      "--disable-tls-check"
-    ]
-
-    system "./configure", *args
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--disable-silent-rules",
+                          "--prefix=#{prefix}",
+                          "--disable-tls-check"
     system "make", "install"
   end
 end
diff --git a/libvirt-glib.rb b/libvirt-glib.rb
index 0bcf181..483aa1e 100644
--- a/libvirt-glib.rb
+++ b/libvirt-glib.rb
@@ -3,13 +3,13 @@ class LibvirtGlib < Formula
   url "https://libvirt.org/sources/glib/libvirt-glib-0.2.2.tar.gz"
   sha256 "d7be16025231c91ccae43838b7cdb1d55d181856a2a50b0f7b1c5078ad202d9d"
 
-  depends_on "pkg-config" => :build
-  depends_on "intltool" => :build
   depends_on "gobject-introspection" => :build
+  depends_on "intltool" => :build
+  depends_on "pkg-config" => :build
 
   depends_on "glib"
-  depends_on "libxml2"
   depends_on "libvirt"
+  depends_on "libxml2"
 
   patch :DATA # remove unsupported linker option: --version-script
 
@@ -18,7 +18,6 @@ class LibvirtGlib < Formula
                           "--disable-silent-rules",
                           "--enable-introspection",
                           "--prefix=#{prefix}"
-
     system "make", "install"
   end
 end
diff --git a/spice-gtk.rb b/spice-gtk.rb
index 7f838ed..800a473 100644
--- a/spice-gtk.rb
+++ b/spice-gtk.rb
@@ -5,8 +5,8 @@ class SpiceGtk < Formula
 
   depends_on "gobject-introspection" => :build
   depends_on "intltool" => :build
-  depends_on "pkg-config" => :build
   depends_on "libtool" => :build
+  depends_on "pkg-config" => :build
   depends_on "vala" => :build
 
   depends_on "cairo"
diff --git a/usbredir.rb b/usbredir.rb
index a814899..3bf9618 100644
--- a/usbredir.rb
+++ b/usbredir.rb
@@ -3,8 +3,8 @@ class Usbredir < Formula
   url "http://www.spice-space.org/download/usbredir/usbredir-0.7.tar.bz2"
   sha256 "0a63a0712b5dc62be9cca44f97270fea5d1ec1fe7dde0c11dc74a01c8e2006aa"
 
-  depends_on "pkg-config" => :build
   depends_on "libtool" => :build
+  depends_on "pkg-config" => :build
 
   depends_on "libusb"
 
diff --git a/virt-manager.rb b/virt-manager.rb
index 0d1f168..69da97f 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -3,25 +3,23 @@ class VirtManager < Formula
   url "https://fedorahosted.org/released/virt-manager/virt-manager-1.2.1.tar.gz"
   sha256 "74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be"
 
-  depends_on "pkg-config" => :build
   depends_on "intltool" => :build
+  depends_on "pkg-config" => :build
 
-  depends_on "pygobject3"
+  depends_on "d-bus"
+  depends_on "gnome-icon-theme"
   depends_on "gtk+3"
+  depends_on "gtk-vnc"
+  depends_on "hicolor-icon-theme"
+  depends_on "libosinfo"
+  depends_on "libvirt"
   depends_on "libvirt-glib"
   depends_on "libxml2" => "with-python"
-  depends_on "vte3"
-  depends_on "d-bus"
-  depends_on :x11
-  depends_on "libosinfo"
-
-  # TODO: audio
-  depends_on "gtk-vnc"
+  depends_on "pygobject3"
   depends_on "spice-gtk"
-
-  depends_on "libvirt"
-  depends_on "hicolor-icon-theme"
-  depends_on "gnome-icon-theme"
+  depends_on "vte3"
+  depends_on :x11
+  # TODO: audio
 
   resource "libvirt-python" do
     url "https://libvirt.org/sources/python/libvirt-python-1.2.21.tar.gz"
diff --git a/virt-viewer.rb b/virt-viewer.rb
index a417392..134458e 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -3,21 +3,19 @@ class VirtViewer < Formula
   url "https://fedorahosted.org/released/virt-viewer/virt-viewer-2.0.tar.gz"
   sha256 "e9c583bcb5acdabac6a8a13eff6ce4e093a3050645771628f832e15ce685d437"
 
-  depends_on "pkg-config" => :build
   depends_on "intltool" => :build
   depends_on "libtool" => :build
+  depends_on "pkg-config" => :build
 
   depends_on "gtk+3"
-  depends_on :x11
-
-  # TODO: audio
   depends_on "gtk-vnc"
+  depends_on "hicolor-icon-theme"
+  depends_on "libvirt"
+  depends_on "shared-mime-info"
   depends_on "spice-gtk"
   depends_on "spice-protocol"
-
-  depends_on "libvirt"
-  depends_on "hicolor-icon-theme"
-  depends_on "shared-mime-info"
+  depends_on :x11
+  # TODO: audio
 
   def install
     system "./configure", "--disable-dependency-tracking",