Reduced first server code block from two to one.