Refactoring

Cleaned up Observer/Observable relationships