Refactor, using make instead of shell script to build the environment