Refactor
add make