code base and result cleanup