Clean up the Server command a bit

Signed-off-by: David Celis <me@davidcel.is>