diff --git a/lib/units/device/plugins/filesystem.js b/lib/units/device/plugins/filesystem.js
index 45fa563e..8825aa11 100644
--- a/lib/units/device/plugins/filesystem.js
+++ b/lib/units/device/plugins/filesystem.js
@@ -1,82 +1,74 @@
-var util = require('util')
-
-var syrup = require('stf-syrup')
-var adbkit = require('adbkit')
-var path = require('path')
-
-var logger = require('../../../util/logger')
-var wire = require('../../../wire')
-var wireutil = require('../../../wire/util')
-
-module.exports = syrup.serial()
-  .dependency(require('../support/adb'))
-  .dependency(require('../support/router'))
-  .dependency(require('../support/push'))
-  .dependency(require('../support/storage'))
-  .dependency(require('../resources/minicap'))
-  .dependency(require('./util/display'))
-  .define(function(options, adb, router, push, storage, minicap, display) {
-    var log = logger.createLogger('device:plugins:filesystem')
-    var plugin = Object.create(null)
-
-    plugin.retrieve = function(file) {
-      log.info('Retriving file %s', file)
-
-      return adb.stat(options.serial, file)
-        .then(function(stats){
-          if (stats.size == 0){
-            log.info(util.format("File %s is empty", file))
-          }
-          
-          return adb.pull(options.serial, file)
-            .then(function(transfer){
-              // if this is a new store type, somethings need add to units/storage/plugins/
-              return storage.store('blob', transfer, { 
-                filename: path.basename(file),
-                contentType: 'application/octet-stream', // FIXME(ssx): need to detect file type
-                knownLength: stats.size
-              })
-            })
-        })
-        .finally(function(){
-          log.info(util.format("File %s transfer finished", file))
-        })
-    }
-
-    router.on(wire.FileSystemGetMessage, function(channel, message) {
-      var reply = wireutil.reply(options.serial)
-      plugin.retrieve(message.file)
-        .then(function(file){
-          push.send([
-            channel,
-            reply.okay('success', file)
-          ])
-        })
-        .catch(function(err){
-          log.error('File retrieve %s failed\n%s', message.file, err.stack)
-          push.send([
-            channel,
-            reply.fail(err.message)
-          ])
-        })
-    })
-
-    router.on(wire.FileSystemListMessage, function(channel, message){
-      var reply = wireutil.reply(options.serial)
-      adb.readdir(options.serial, message.dir)
-        .then(function(files){
-          push.send([
-            channel,
-            reply.okay('success', files)
-          ])
-        })
-        .catch(function(err){
-          log.error('Dir list %s failed\n%s', message.dir, err.stack)
-          push.send([
-            channel,
-            reply.fail(err.message)
-          ])
-        })
-    })
-    return plugin;
-  })
+var syrup = require('stf-syrup')
+var path = require('path')
+
+var logger = require('../../../util/logger')
+var wire = require('../../../wire')
+var wireutil = require('../../../wire/util')
+
+module.exports = syrup.serial()
+  .dependency(require('../support/adb'))
+  .dependency(require('../support/router'))
+  .dependency(require('../support/push'))
+  .dependency(require('../support/storage'))
+  .define(function(options, adb, router, push, storage) {
+    var log = logger.createLogger('device:plugins:filesystem')
+    var plugin = Object.create(null)
+
+    plugin.retrieve = function(file) {
+      log.info('Retrieving file "%s"', file)
+
+      return adb.stat(options.serial, file)
+        .then(function(stats) {
+          return adb.pull(options.serial, file)
+            .then(function(transfer) {
+              // We may have add new storage plugins for various file types
+              // in the future, and add proper detection for the mimetype.
+              // But for now, let's just use application/octet-stream for
+              // everything like it's 2001.
+              return storage.store('blob', transfer, {
+                filename: path.basename(file)
+              , contentType: 'application/octet-stream'
+              , knownLength: stats.size
+              })
+            })
+        })
+    }
+
+    router.on(wire.FileSystemGetMessage, function(channel, message) {
+      var reply = wireutil.reply(options.serial)
+      plugin.retrieve(message.file)
+        .then(function(file) {
+          push.send([
+            channel
+          , reply.okay('success', file)
+          ])
+        })
+        .catch(function(err) {
+          log.warn('Unable to retrieve "%s"', message.file, err.stack)
+          push.send([
+            channel
+          , reply.fail(err.message)
+          ])
+        })
+    })
+
+    router.on(wire.FileSystemListMessage, function(channel, message) {
+      var reply = wireutil.reply(options.serial)
+      adb.readdir(options.serial, message.dir)
+        .then(function(files) {
+          push.send([
+            channel
+          , reply.okay('success', files)
+          ])
+        })
+        .catch(function(err) {
+          log.warn('Unable to list directory "%s"', message.dir, err.stack)
+          push.send([
+            channel
+          , reply.fail(err.message)
+          ])
+        })
+    })
+
+    return plugin
+  })
diff --git a/res/app/control-panes/filesystem/fs.jade b/res/app/control-panes/filesystem/fs.jade
index 1a739532..8cd7835b 100644
--- a/res/app/control-panes/filesystem/fs.jade
+++ b/res/app/control-panes/filesystem/fs.jade
@@ -20,11 +20,9 @@
             i.fa.fa-file-o(ng-hide='f.mode|isdir')
         td
           button.btn.btn-sm.btn-primary-outline(
-          ng-click='dirEnter(f.name)', ng-show='f.mode|isdir')
-            {{f.name}} 
+          ng-click='dirEnter(f.name)', ng-show='f.mode|isdir') {{f.name}}
           button.btn.btn-sm.btn-primary-outline(
-          ng-click='getFile(f.name)', ng-hide='f.mode|isdir')
-            {{f.name}}
+          ng-click='getFile(f.name)', ng-hide='f.mode|isdir') {{f.name}}
         td
           i {{f.mode|mode2unix}}
         td {{f.size}}