clean up model
fix Makefile
migrate file
fix lint