[Update] - Minor refactoring