removed repetitions in Makefile and made more regular