Added presentation + minor refactoring