Improved the readability of the makefiles.