Observable.zip fix
Refactoring
Refactoring
Small refactoring