cleanup
Merge pull request #23 from lipp/refactor-daemon

cleanup