A little cosmetics and refactoring.
Updated gems.
Refactored observe callback condition on observe notifications.