ds: Clean up makefile + switch comparison around

Still fails