cleaning up some server code. No functional changes.
update description in default config.
Merge pull request #497 from continuuity/feature/server-cleanup

cleaning up some server code. No functional changes.