minor cleanup: some imports