Pre-presentation refactoring 3