Started code cleanup on ObserverController