Made changes reflecting comments in code review.