Code commenting, clean up, rearrangement.