name shadowing cleanup