Minor refactor/clean-up