Minor changes.
Clean up.
More clean ups.