Add readability suggestions from Ben