More todo updates
Convert control statement bodies to blocks
- automatic refactoring using Eclipse cleanup
- nested statements without brackets are very error prone
merge branch stmt2blocks