Minor refactoring.

Got rid of cases where @observable was set for entire classes. Instead
individual data fields are now made @observable.

Tried to move stuff around a bit for improved readability.