refactor
refactor
clean up and use home brew