Refactor on photo init