changed some naming + comment fix