refactor module fdr