Unpack

some formatting things were introduced by go fmt - should be no substantive changes in daemon (pls check!)