Commenting and basic clean-up