Re-generated Makefiles
Code cleanup