cleaned up server a little more