Addressing Code Review Comments #1