Improved the cleaner, and added the import feature.