Fixed Code Review Comments.