Restore Makefile
Cleaning
Simplification and optimization