Made Makefile more maintainable.