further code cleanup and refactoring
Merge branch 'master' of github.com:processing/processing