Small refactor pending possible scope expansion