Comments and general code cleanup. (Server side)