minor cleanup - rjrjr