ISE code cleanup