minor enhance
refactor