Fixed all suggestions from PR attempt.