Cleaning up for better usability.