update readme and makefile
refactor