Move functions internally in namespace