removed type shadow warnings