Refactoring of observers