Cosmetic changes - rename of variable and addition of logs/comments