Some cosmetic changes.
Stop using 'with'.
Merge pull request #11 from chiro/cleanup

Stop using 'with'.