Sanitized the makefiles