[SG] Cleaning up comments/code