Server: cleanup and remove warnings
Server: fix indentation and ASCII art
Server: add some comments