more formatting and ISA removal