Cleaning up presenter.php