Bat update + refactor
refactoring
push