Minor code cleaning, Makefile rewritten, README updated