Commenting and cleaning up.