General redesign to decrease CRAP index