Polish the server