Clear and modernize