Clean up.
Improvements?