refactor server details