Incorporated Code Review Comments