Almost done refactoring the observer (down to `observer.remove()`), added a bunch of variable padding