Refactoring of one of noisy controller