improved makefile, changed indentation