minor: some clean ups.