Small refactoring #2 appendix...