fixed typename/const usage