Adjusting code after review.