better use of RxJava