Apply suggestions from comments.