some minor tweaks
Updated hard-coding for Dave's new round, some PEP-8 cleanup.