diff --git a/system-tools.yaml b/system-tools.yaml
index 1f7c8ea..436b805 100644
--- a/system-tools.yaml
+++ b/system-tools.yaml
@@ -1,18 +1,18 @@
+---
 document: modulemd
 version: 1
 data:
   name: system-tools
   summary: Provides the tools a general Linux user expects on the command line
-  description: >
-            As the modular server is attempting to start from an extrememly
-            small baseline, many of the tools one normally expects are not 
-            provided by default. However, an evaluator of the modular OS often
-            needs these tools. At present, there is nowhere to get them from, 
-            hence the need for this module.
+  description: As the modular server is attempting to start from an extrememly
+               small baseline, many of the tools one normally expects are not
+               provided by default. However, an evaluator of the modular OS
+               often needs these tools. At present, there is nowhere to get
+               them from, hence the need for this module.
   license:
     module:
       - MIT
-    content: 
+    content:
       - ??
   dependencies:
     buildrequires:
@@ -34,103 +34,94 @@ data:
         - iputils
         - less
         - procps-ng
+  filter:
+    rpms:
+      - emacs
+      - emacs-terminal
+      - nmap-frontend
+      - pam_ssh_agent_auth
+      - perl-SGMLpm
+      - vim-X11
+      - wireshark-gnome
+      - wireshark-devel
+
+  api:
+    rpms:
+      - calc
+      - dateutils
+      - gcal
+      - htop
+      - iotop
+      - iproute
+      - iputils
+      - joe
+      - less
+      - vim-minimal
+      - emacs-nox
+      - nano
+      - nmap
+      - nmap-ncat
+      - rdiff-backup
+      - screen
+      - tmux
+      - wireshark
+
   components:
     rpms:
-      api:
-        - calc
-        - dateutils
-        - gcal
-        - htop
-        - iotop
-        - iproute
-        - iputils
-        - joe
-        - less
-        - openssh-clients
-        - vim-minimal
-        - emacs-nox
-        - nano
-        - nmap
-        - nmap-ncat
-        - rdiff-backup
-        - screen
-        - tmux
-        - wireshark
-
-      filter:
-        - emacs
-        - emacs-terminal
-        - nmap-frontend
-        - openssh-askpass
-        - openssh-cavs
-        - openssh-clients-ssh1
-        - openssh-keycat
-        - openssh-ldap
-        - openssh-server
-        - pam_ssh_agent_auth
-        - perl-SGMLpm
-        - vim-X11
-        - wireshark-gnome
-        - wireshark-devel
-        
-      packages:
-        calc: 
-          rationale: command-line calculator
-          ref: f26
-        dateutils:
-          rationale: command-line date and time math
-          ref: f26
-        emacs-nox:
-          rationale: necessary for editor wars
-          ref: f26
-        gcal:
-          rationale: better command-line calendar utility
-          ref: f26
-        hostname:
-          rationale: provides hostname command(s); may later be removed in favor of hostnamectl
-          ref: f26
-        htop:
-          rationale: popular alternative process monitoring tool
-          ref: f26
-        iotop:
-          rationale: basic diagnostic tool
-          ref: f26
-        iproute:
-          rationale: provides common network commands like ip
-          ref: f26
-        iputils:
-          rationale: provides common network commands like ping
-          ref: f26
-        joe:
-          rationale: not necessary for editor wars at all but here it is anyway
-          ref: f26
-        procps-ng:
-          rationale: provides common system tools like ps
-          ref: f26
-        less:
-          rationale: provides less
-          ref: f26
-        nano:
-          rationale: like Canada for editor wars
-          ref: f26
-        nmap:
-          rationale: network diagnostic tool + also netcat
-          ref: f26
-        openssh:
-          rationale: provides openssh client
-          ref: f26
-        rdiff-backup:
-          rationale: incremental backup and mirror utility
-          ref: f26
-        screen:
-          rationale: for the screen vs. tmux wars
-          ref: f26
-        tmux:
-          rationale: for the screen vs. tmux wars
-          ref: f26
-        vim:
-          rationale: necessary for editor wars
-          ref: f26
-        wireshark:
-          rationale: network traffic analyzer
-          ref: f26
+      calc:
+        rationale: command-line calculator.
+        ref: f26
+      dateutils:
+        rationale: command-line date and time math.
+        ref: f26
+      emacs-nox:
+        rationale: necessary for editor wars.
+        ref: f26
+      gcal:
+        rationale: better command-line calendar utility.
+        ref: f26
+      hostname:
+        rationale: provides hostname command(s); may later be removed.
+        ref: f26
+      htop:
+        rationale: popular alternative process monitoring tool.
+        ref: f26
+      iotop:
+        rationale: basic diagnostic tool.
+        ref: f26
+      iproute:
+        rationale: provides common network commands like ip.
+        ref: f26
+      iputils:
+        rationale: provides common network commands like ping.
+        ref: f26
+      joe:
+        rationale: not necessary for editor wars at all but here it is anyway.
+        ref: f26
+      procps-ng:
+        rationale: provides common system tools like ps.
+        ref: f26
+      less:
+        rationale: provides less.
+        ref: f26
+      nano:
+        rationale: like Canada for editor wars.
+        ref: f26
+      nmap:
+        rationale: network diagnostic tool + also netcat.
+        ref: f26
+      rdiff-backup:
+        rationale: incremental backup and mirror utility.
+        ref: f26
+      screen:
+        rationale: for the screen vs. tmux wars.
+        ref: f26
+      tmux:
+        rationale: for the screen vs. tmux wars.
+        ref: f26
+      vim:
+        rationale: necessary for editor wars.
+        ref: f26
+      wireshark:
+        rationale: network traffic analyzer.
+        ref: f26