Code cleanup, add some hopefully useful comments
Merge branch 'master' of https://github.com/jaromanda/dnas-proxy
more code cleanup