Minor refactor of variable declarations