Pyhonesque changes recommended by @jmcarp