Refactoring old photo application from years ago