Implement code cleanup. Add icon.