minor refactors
refactored number capture