Commenting, cleanup.