Minor revision of makefile and code cleaning