Commentation and cleanup.