Another style improvements.