the above two changes are cosmetic and also violate hadley's coding style; please revert