Makefile is easier to read
Added missing dependencies