Refactor latest updates