Minor changes like removing redundant code or fixing comments/annotations