[Refactoring] Added some comments
Merge remote-tracking branch 'github/master'