Update: Refactor