Server.java cleanup: removed tabs
merge with refactor