Code review changes made.