refactoring: win and lose step in theirs own modules