Adding some comments in source code + small code modification