code enhancement and reduction in cbi files