some flappy code cleanup
Merge pull request #459 from code-dot-org/flappyImprovements

some flappy code cleanup