Do not shadow parameter names. Style improvements.