Clean up on PR code-dot-org#302. + Adding bird hopping