major cleanup during review