Small refactor to server spec