Cleanup, formatting, ordering.