Commenting and name fix