Reorganization of method order.

Cleanup.