Refactored out server config, some slight cleanup.