cleaned up photo class