Updated Server, removed ugly code