Clarify more with comments parts of code