Fix warning.
Cleanup and re-order.