refactor events observers parser