Refactored Presenter (code quality)