Clean up; Paperclip
Update factory