Refactor
make osx