more simplifications
started removing structured code
completed removing all structured programming constructs
move stuff around