Slight cleanup, using folding