refactor/cleanup with glob