Refactoring code.
Merge branch 'master' of github.com:firebase/office-mover-5000