- continue refactoring presentation