[CLEANUP] Minor refactoring