naming and comment corrections