Fix up whitespace issues with Makefiles and trailing space