some more refactorings
Merge branch 'master' of https://github.com/jashkenas/ruby-processing