Ran Reshaper code cleanup