Small reorganization and preparation for notes.