Adding appropriate comments