Commenting and cleanup pass through code.