general refactoring random changes