commit point
refactor