Code general refactoring.