Refactor
Added presentation