photo refactor/ constructor fix