remove Server username
Fix formatting