Remove redundant if
Remove comments
Add server class