Remove JP (#2)

Just some minor stuff, but one important fix (reverting the tabs->spaces conversion on makefile).