Fixed pulling data from Firebase, refactoring needed