#12: some clean up