Make Photo parcelable
Minor clean up