Remove unnecessary change, add comments