Commenting and clean up