some clean up

clean up the integration subroutines to correspond with the logic map
drawn on my notes