refactoring in nosdeputes