Pre-presentation refactoring 2