fix import and split line conventions