minor
refactor