review + major cleanup