More uniform make

ping @Eric89GXL