Slight rearrange of the Makefile for easier readability