clean up decomposed return