Observables and refactoring