Clarify comments.
Rearrange code.