RxJS refactor: BehaviourSubjects