Refactoring

Refactoring Puffin.Screenshot