minor cleanup - gonzalo to do tests