Refactoring updates.