Added source code review comments