Clean up for usability.