Rewrite CRTP structure to better one