flip cleanup
Merge pull request #369 from mozilla/betterFlip

flip cleanup