Refine the comments and variables names in Giri

This is a trivial commit.