Refactor the server properties a bit.