Minor refactoring for brevity