comments, code rearrangement
2.0.3