Code refactor
Starting conversion to Angularfire