removed internal servernames, more tabulation