some reordering and cleanup
some reordering and cleanup

schieb/angr,tyb0807/angr,chubbymaggie/simuvex,iamahuman/angr,iamahuman/angr,tyb0807/angr,chubbymaggie/angr,axt/angr,f-prettyland/angr,tyb0807/angr,chubbymaggie/simuvex,iamahuman/angr,angr/angr,chubbymaggie/simuvex,axt/angr,schieb/angr,angr/angr,chubbymaggie/angr,angr/simuvex,chubbymaggie/angr,f-prettyland/angr,schieb/angr,f-prettyland/angr,axt/angr,angr/angr