Refactor: Minor refactor