Local characteristics update and refactoring.