Refactoring
Added presentation