- small refactorings: throw out own Observer decl
 - small refactorings: fixed issues found by the Intellij inspection