Some cleanup in makefile

Looked like sh1t before this