Update header and clean imports