Made fixes based on the first review.