Cleaning up Rxjava controller to use just flatMap instead of map(...).flatMap(...)