clean added in makefile
better style code
better style code