2nd try - Refactor paperclip code