Update: Refactoring.