Changed a few comments/variable names