Some clean-up and comments
Getting ready to introduce firebase-simple-login auth