faster
refactor