code cleanup, even more jQuery-like
Merge remote-tracking branch 'origin/master' into gh-pages