Lots of cleanup. Homogenizing code, starting 3rd event itteration