ObserveOn Refactor

Refactor and small fixes of ObserveOn with @headinthebox