some cleaning in parameter