minor cleanup of import