Updated Makefile
Removed type ambiguity, improved import explicitness