Cleanup of server reading code, preparation, for dynamic reading from files.
4 files changed