Fixed Code Review Comments