Improving style and verifying passing