Improving style consistency and simplifying