Perl-ish cleanups and fixes
Merge pull request #1 from dparrish/master

Perl-ish cleanups and fixes