Updated Makefile
Removed type ambiguity and unnessisary imports