[Phoo]: Apply new changes in comments