refactor rxjs demos a bit