Commenting + removing unnecessary code