Commenting out unused code and adding comments