Clean up photo.controller

Clean up photo.controller