Code comment and reorder.