Photo frame refactoring