Commenting and general cleanup.