Clean up in prep for pull-request back to @inez
Merge pull request #2 from Krinkle/master

Clean up