refactoring statistics and control indep modules