Method subtraction added
Commenting and some name changes

Name changes should not have any effect.