Fixed first round of suggestions in code review.