move class out of useless wrapper function