Minor refactor of observer