Adding some more comments everywhere