General cleanup
    * Formatting of imports w/stylish-haskell
    * Removed remaining unqualified imports from non-test code
    * Some tabularizing