Minor refactor for server