Apply some changes according to Bahman review.