Refactoring presentation