code cleanup
Merge branch 'develop' of github.com:Sable/soot into develop