rename and made fns private