Reduced iniP from n^3 to n^2
Cleanup of Makefile