cleaned Makefile and setup.py