Cleanup and comments.
Cleanup and comments.

Solinea/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server