made Makefile more regular