Code Review - Adding code comments