general review and class cleanup