Minor cleanup, renaming
Commented the server code a bit.